Bump to 4.1.2

I suspect lupdate isn't smart enough to figure out what tr() is suppose
to do, so just make it a static function in class.
The error was: tr() cannot be called without context

.appveyor.yml

@@ -45,8 +45,7 @@ before_build:
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
   - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
   # setup project
-  - COPY /Y "%CACHE_DIR%\winconf.pri" "%REPO_DIR%"
-  - COPY /Y "%CACHE_DIR%\winconf-msvc.pri" "%REPO_DIR%"
+  - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
   - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
 

.travis.yml

@@ -76,10 +76,13 @@ before_install:
 
   - shopt -s expand_aliases
   - alias make="colormake -j3" # Using nprocs/2 sometimes may fail (gcc is killed by system)
-  #- libt_path="$HOME/libt_install"
-  #- ltconf="$ltconf --prefix="$libt_path" --disable-geoip"
   - qbt_path="$HOME/qbt_install"
-  - qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH="$libt_path/lib/pkgconfig":/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+  - |
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      qbtconf="$qbtconf --prefix="$qbt_path" PKG_CONFIG_PATH=/opt/qt55/lib/pkgconfig:$PKG_CONFIG_PATH"
+    else
+      qbtconf="$qbtconf --prefix="$qbt_path""
+    fi
 
   # options for specific branches
   - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
@@ -131,13 +134,13 @@ install:
         cp "version" $HOME/hombebrew_cache
         cd "$HOME/hombebrew_cache"
         wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz
+        wget https://builds.shiki.hu/homebrew/libtorrent-rasterbar-1.1.7+git20180422.3ede0b9c20+patched-configure.el_capitan.bottle.tar.gz
       fi
 
       # Copy custom libtorrent bottle to homebrew's cache so it can find and install it
       # Also install our custom libtorrent formula by passing the local path to it
       # These 2 files are restored from Travis' cache.
-      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.0.11+git20170910.6d5625e0ea.el_capitan.bottle.tar.gz" "$(brew --cache)"
+      cp "$HOME/hombebrew_cache/libtorrent-rasterbar-1.1.7+git20180422.3ede0b9c20+patched-configure.el_capitan.bottle.tar.gz" "$(brew --cache)"
       brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb"
 
       if [ "$build_system" = "cmake" ]; then
@@ -163,16 +166,23 @@ script:
     if [ "$build_system" = "cmake" ]; then
       mkdir build
       cd build
-      cmake -DGUI=${gui} -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
+      if [ "$gui" = "false" ]; then
+        DISABLE_GUI_OPTION="-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON"
+      fi
+      cmake $DISABLE_GUI_OPTION -DCMAKE_INSTALL_PREFIX="$qbt_path" "$MY_CMAKE_OPENSSL_HINT" \
         -G "Ninja" -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE ..
       BUILD_TOOL="ninja"
     fi
     if [ "$build_system" = "qmake" ]; then
-      ./bootstrap.sh && ./configure $qbtconf
       if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+        # For some reason for RC_1_1 we need to also specify the OpenSSL compiler/linker flags
+        # Homebrew doesn't symlink OpenSSL for security reasons
+        ./bootstrap.sh && ./configure $qbtconf CXXFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --cflags openssl)" LDFLAGS="$(PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:$PKG_CONFIG_PATH" pkg-config --libs openssl)"
         sed -i "" -e "s/^\(CC.*&&\).*$/\1 $CC/" src/Makefile  # workaround for Qt & ccache: https://bugreports.qt.io/browse/QTBUG-31034
         sed -i "" -e "s/^\(CXX.*&&\).*$/\1 $CXX/" src/Makefile
         sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs -Wno-inconsistent-missing-override/' src/Makefile
+      else
+        ./bootstrap.sh && ./configure $qbtconf
       fi
       BUILD_TOOL="make"
     fi

.tx/config

@@ -12,7 +12,7 @@ mode = developer
 
 
 [qbittorrent.qbittorrentdesktop_master]
-source_file = src/icons/qBittorrent.desktop
+source_file = dist/unix/qbittorrent.desktop
 source_lang = en
 type = DESKTOP
 minimum_perc = 23

CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(VERSION 3.5)
+cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+
+message(WARNING "No official support for cmake build system. If it is broken, please submit patches!")
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 include(FunctionReadVersion)
@@ -25,32 +26,29 @@ add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
 add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
 add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
 
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-endif (UNIX AND NOT APPLE)
+include(GNUInstallDirs)
+include(FeatureSummary)
+
+# version requirements
+set(requiredBoostVersion 1.35)
+set(requiredQtVersion 5.5.1)
 
 if(WIN32)
     include(winconf)
 endif(WIN32)
 
-# we need options here, because they are used not only in "src" subdir, but in the "dist" dir too
-include(CMakeDependentOption)
 
-option(SYSTEM_QTSINGLEAPPLICATION
-    "Use the system qtsingleapplication library or shipped one otherwise")
-
-option(GUI "Allows to disable GUI for headless running. Disables QtDBus and the GeoIP Database" ON)
-
-option(WEBUI "Allows to disable the WebUI." ON)
-
-if (WIN32)
-    option(STACKTRACE_WIN "")
-else (WIN32)
-    cmake_dependent_option(SYSTEMD "Install the systemd service file (headless only)" OFF
-        "NOT GUI" OFF)
-    cmake_dependent_option(DBUS "Enable use of QtDBus (GUI only)" ON "GUI" OFF)
-endif(WIN32)
+# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
+include(CompileFeature)
 
+optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
+    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
+optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
+    DEFAULT ON ENABLED STACKTRACE)
+optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
+    DEFAULT ON DISABLED DISABLE_WEBUI)
 
 add_subdirectory(src)
 add_subdirectory(dist)
+
+feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)

CODING_GUIDELINES.md

@@ -1,10 +1,38 @@
-All new code must follow the following coding guidelines.  
-If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
+All new code **must** follow the following coding guidelines.  
+If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes.  
+For programming languages other than C++ (e.g. JavaScript) used in this repository and submodules, unless otherwise specified, coding guidelines listed here applies as much as possible.
+
 **Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.  
 **Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
 **Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
 
-### 1. Curly braces ###
+### Table Of Contents
+
+* [1. New lines & curly braces](#1-new-lines--curly-braces)
+  * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
+  * [b. Other code blocks](#b-other-code-blocks)
+  * [c. Blocks in switch's case labels](#c-blocks-in-switchs-case-labels)
+  * [d. If-else statements](#d-if-else-statements)
+  * [e. Single statement if blocks](#e-single-statement-if-blocks)
+  * [f. Acceptable conditions to omit braces](#f-acceptable-conditions-to-omit-braces)
+  * [g. Brace enclosed initializers](#g-brace-enclosed-initializers)
+* [2. Indentation](#2-indentation)
+* [3. File encoding and line endings](#3-file-encoding-and-line-endings)
+* [4. Initialization lists](#4-initialization-lists)
+* [5. Enums](#5-enums)
+* [6. Names](#6-names)
+  * [a. Type names and namespaces](#a-type-names-and-namespaces)
+  * [b. Variable names](#b-variable-names)
+  * [c. Private member variable names](#c-private-member-variable-names)
+* [7. Header inclusion order](#7-header-inclusion-order)
+* [8. Include guard](#8-include-guard)
+* [9. Misc](#9-misc)
+* [10. Git commit message](#10-git-commit-message)
+* [11. Not covered above](#11-not-covered-above)
+---
+
+### 1. New lines & curly braces ###
+
 #### a. Function blocks, class/struct definitions, namespaces ####
 ```c++
 int myFunction(int a)
@@ -89,18 +117,8 @@ default:
 }
 ```
 
-#### d. Brace enclosed initializers ####
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
-But you must insert a space between the variable name and initializer.
-```c++
-Class obj {}; // empty
-Class obj {expr};
-Class obj {expr1, /*...,*/ exprN};
-QVariantMap map {{"key1", 5}, {"key2", 10}};
-```
-
-### 2. If blocks ###
-#### a. Multiple tests ####
+#### d. If-else statements ####
+The `else if`/`else` must be on their own lines:
 ```c++
 if (condition) {
     // code
@@ -112,40 +130,71 @@ else {
     // code
 }
 ```
-The `else if`/`else` must be on their own lines.
 
-#### b. Single statement if blocks ####
-**Most** single statement if blocks should look like this:
+#### e. Single statement if blocks ####
+Most single statement if blocks should look like this:
 ```c++
 if (condition)
     a = a + b;
 ```
 
-One acceptable exception to this **can be** `return`, `break` or `continue` statements, provided that the test condition isn't very long. However you can choose to use the first rule instead.
+One acceptable exception to this can be `return`, `break` or `continue` statements,
+provided that the test condition isn't very long and its body statement occupies only one line.
+However you can still choose to use the first rule.
 ```c++
-a = myFunction();
-b = a * 1500;
+if (a > 0) return;
 
-if (b > 0) return;
-c = 100 / b;
+while (p) {
+    // ...
+    if (!b) continue;
+}
 ```
 
-#### c. Using curly braces for single statement if blocks ####
+#### f. Acceptable conditions to omit braces ####
+When the conditional statement in `if`/`else` has only one line and its body occupy only one line,
+this also applies to loops statements.  
+Notice that for a series of `if - else` branches, if one branch needs braces then all branches must add braces.
+```c++
+if (a < b)  // conditional statement
+    do(a);  // body
 
-However, there are cases where curly braces for single statement if blocks **should** be used.
-* If some branch needs braces then all others should use them. Unless you have multiple `else if` in a row and the one needing the braces is only for a very small sub-block of code.
-* Another exception would be when we have nested if blocks or generally multiple levels of code that affect code readability.
+if (a < b)
+    do(a);
+else if (a > b)
+    do(b);
+else
+    do(c);
 
-Generally it will depend on the particular piece of code and would be determined on how readable that piece of code is. **If in doubt** always use braces if one of the above exceptions applies.
+if (a < b) {
+    do(a);
+}
+else if (a > b) {  // curly braces required here, then all branches should also add them
+    do(b);
+    do(d);
+}
+else {
+    do(c);
+}
+```
 
-### 3. Indentation ###
+#### g. Brace enclosed initializers ####
+Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
+But you must insert a space between the variable name and initializer.
+```c++
+Class obj {}; // empty
+Class obj {expr};
+Class obj {expr1, /*...,*/ exprN};
+QVariantMap map {{"key1", 5}, {"key2", 10}};
+```
+
+### 2. Indentation ###
 4 spaces.
 
-### 4. File encoding and line endings. ###
+### 3. File encoding and line endings ###
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-### 5. Initialization lists. ###
+### 4. Initialization lists ###
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
 ```c++
 myClass::myClass(int a, int b, int c, int d)
@@ -158,7 +207,7 @@ myClass::myClass(int a, int b, int c, int d)
 }
 ```
 
-### 6. Enums. ###
+### 5. Enums ###
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
 ```c++
 enum Days
@@ -173,7 +222,7 @@ enum Days
 };
 ```
 
-### 7. Names. ###
+### 6. Names ###
 All names should be camelCased.
 
 #### a. Type names and namespaces ####
@@ -207,40 +256,89 @@ class MyClass
 }
 ```
 
-### 8. Header inclusion order. ###
-The headers should be placed in the following order:
- 1. Module header (in .cpp)
- 2. System/Qt/Boost etc. headers (splitted in subcategories if you have many).
- 3. Application headers, starting from *Base* headers.
+### 7. Header inclusion order ###
+The headers should be placed in the following group order:
+  1. Module header (in .cpp)
+  2. C++ Standard Library headers
+  3. System headers
+  4. Boost library headers
+  5. Libtorrent headers
+  6. Qt headers
+  7. qBittorrent's own headers, starting from the *base* headers.
+
+The headers should be ordered alphabetically within each group.  
+If there are conditionals for the same header group, then put them at the bottom of the respective group.  
+If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
+
+One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
-The headers should be ordered alphabetically within each group (subgroup).<br/>
-<br/>
 Example:
 ```c++
-// examplewidget.cpp
+// file: examplewidget.cpp
 
+// Module header
 #include "examplewidget.h"
 
-#include <cmath>
+// exceptions, headers containing version number
+#include <boost/version.hpp>
+#include <libtorrent/version.hpp>
+#include <QtGlobal>
+
+// C++ Standard Library headers
 #include <cstdio>
 
-#include <QDateTime>
-#include <QList>
+#ifdef Q_OS_WIN  // conditional
+#include <cmath>
+#endif
+
+// System headers
+#ifdef Q_OS_WIN
+#include <Windows.h>
+#endif
+
+// Boost library headers
+#include <boost/circular_buffer.hpp>
+
+// Libtorrent headers
+#include <libtorrent/session.hpp>
+
+// Qt headers
 #include <QString>
 #include <QUrl>
 
-#include <libtorrent/version.hpp>
+#ifdef Q_OS_MAC  // conditional
+#include <QFont>
+#endif
 
+// conditional that contains headers from several different header groups
+#if LIBTORRENT_VERSION_NUM >= 10100
+#include <memory>
+#include <QElapsedTimer>
+#endif
+
+// qBittorrent's own headers
 #include "base/bittorrent/infohash.h"
-#include "base/bittorrent/session.h"
-#include "base/utils/fs.h"
-#include "base/utils/misc.h"
-#include "base/utils/string.h"
+#include "anothermodule.h"
 #include "ui_examplewidget.h"
+```
+
+### 8. Include guard ###
+`#pragma once` should be used instead of "include guard" in new code:
+```c++
+// examplewidget.h
+
+#pragma once
+
+#include <QWidget>
+
+class ExampleWidget : public QWidget
+{
+    // (some code omitted)
+};
 
 ```
 
-### 9. Misc. ###
+### 9. Misc ###
 
 * Line breaks for long lines with operation:
 
@@ -316,5 +414,16 @@ i++, j--;  // No
 
 * Method definitions aren't allowed in header files
 
-### 10. Not covered above ###
-If something isn't covered above, just follow the same style the file you are editing has. If that particular detail isn't present in the file you are editing, then use whatever the rest of the project uses.
+### 10. Git commit message ###
+1. Limit the subject line to 50 characters. Subject should contain only the very essence of the changes (you should avoid extra details and internals)
+2. Separate subject from body with a blank line
+3. Capitalize the subject line
+4. Do not end the subject line with a period
+5. Use the imperative mood in the subject line (it's like you're ordering the program to do something (e.g. "Don't create temporary substrings")
+6. Wrap the body at 72 characters
+7. Use the body to explain what and why vs. how
+8. If commit fixes a reported issue, mention it in the message body (e.g. `Closes #4134.`)
+
+### 11. Not covered above ###
+If something isn't covered above, just follow the same style the file you are editing has.  
+*This guide is not exhaustive and the style for a particular piece of code not specified here will be determined by project members on code review.*

CONTRIBUTING.md

@@ -1,35 +1,221 @@
-# Filing an issue
+# How to contribute to qBittorrent
 
-### Must read
-* If you aren't sure, you can ask on the [**forum**](http://forum.qbittorrent.org) or read our [**wiki**](http://wiki.qbittorrent.org) first.
-* Do a quick **search**. Others might already reported the issue.
-* Write in **English**!
-* Provide **version** information: (You can find version numbers at menu `Help -> About -> Libraries`)
-  ```
-  qBittorrent:
-  Qt:
-  libtorrent:
-  boost:
-  OS version:
-  ```
-* Provide **steps** to reproduce the problem, it will be easier to pinpoint the fault.
-* **Screenshots**! A screenshot is worth a thousand words. just upload it. [(How?)](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests)
+There are three main ways to contribute to the project.
+Read the respective section to find out more.
 
-### Good to know
-* **Be patient**. The dev team is small and resource limited. Devs finding their free time, analyzing the problem and fixing the issue, it all takes time. :clock3:
-* If you can code, why not become a **contributor** by fixing the issue and open a pull request? :wink:
-* Harsh words or threats won't help your situation. What's worse, your complain will (very likely) to be **ignored**. :fearful:
+### Table Of Contents
 
+*   **[Bug reporting etiquette](#bug-reporting-etiquette)**
+
+
+*   **[Submitting an issue/bug report](#submitting-an-issuebug-report)**
+    *   [What is an actual bug report?](#what-is-an-actual-bug-report)
+    *   [Before submitting a bug report](#before-submitting-a-bug-report)
+    *   [Steps to ensure a good bug report](#steps-to-ensure-a-good-bug-report)
+
+
+*   **[Suggesting enhancements/feature requests](#suggesting-enhancementsfeature-requests)**
+    *   [Before submitting an enhancement/feature request](#before-submitting-an-enhancementfeature-request)
+    *   [Steps to ensure a good enhancement/feature suggestion](#steps-to-ensure-a-good-enhancementfeature-suggestion)
+
+
+*   **[Opening a pull request](#opening-a-pull-request)**
+    *   [Must read](#must-read)
+    *   [Good to know](#good-to-know)
+
+# Bug reporting etiquette
+
+*   Issues, pull requests, and comments must always be in **English.**
+
+*   This project is supported by volunteers, do not expect "customer support"-style interaction.
+
+*   **Be patient.** The development team is small and resource limited. Developers and contributors take from their free time to analyze the problem and fix the issue. :clock3:
+
+*   Harsh words or threats won't help your situation. What's worse, your complain will (very likely) be **ignored.** :fearful:
+
+# Submitting an issue/bug report
+
+This section guides you through submitting an issue/bug report for qBittorrent.
+
+Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
+
+Make sure to follow these rules carefully when submitting a bug report. Failure to do so will result in the issue being closed.
+
+## What is an actual bug report?
+
+Developers and contributors are not supposed to deal with issues for which little to no investigation to find the actual cause of a purported issue was made by the reporter.
+
+Positive contributions are those which are reported with efforts to find the actual cause of an issue, or at the very least efforts were made to narrow it as much as possible.
+
+Requiring people to investigate as much as possible before opening an issue will more than likely avoid burdening the project with invalid issues or issues unrelated to qBittorrent.
+
+The following are _not_ bug reports. **Check the [wiki][wiki-url], [forum][forum-url] or other places for help and support for issues like these**:
+
+-   Explanation of qBittorrent options (see [wiki][wiki-url]).
+-   Help with WebUI setup.
+-   Help with embedded tracker setup.
+-   Help about BitTorrent in general.
+-   Issues with specific search plugins.
+-   Asking for specific builds of qBittorrent other than the current one. You can install older releases at your own risk or for regression testing purposes. Previous Windows and macOS builds are available [here][builds-url].
+    -   If you want older Linux builds, you will have to compile them yourself from the corresponding commits, or ask someone on the [forum][forum-url] to do it for you.
+-   Possibly others. Read on and use common sense.
+
+The issue tracker is for provable issues only: You will have to make the case that the issue is really with qBittorrent and not something else on your side.
+
+To make a case means to provide detailed steps so that anybody can reproduce the issue.
+Be sure to rule out that the issue is not caused by something specific on your side.
+
+Issue reports for bugs that apparently aren't easily reproducible or that you can't figure out what triggers it even though you tried are OK.
+
+Any issue opened without effort to provide the required details for developers, contributors or anybody else to reproduce the problem will be closed as invalid.
+For example:
+-   Crash reports with just a stack trace.
+-   Speculated performance issues that do not come with actual profiling data + analysis supporting the claim.
+
+## Before submitting a bug report
+
+-   **Do some basic troubleshooting (examples)**:
+    -   Restart qBittorrent.
+    -   Restart your PC.
+    -   Update your OS (e.g. Windows updates).
+    -   Update your network card drivers.
+    -   Fully reinstall qBittorrent.
+    -   etc...
+-   Make sure the problem is not caused by anti-virus or other program messing with your files.
+-   Check if you can reproduce the problem in the latest version of qBittorrent.
+-   **Check [forum][forum-url] and [wiki][wiki-url].** You might be able to find the cause of the problem and fix things yourself.
+-   **Check if the issue exists already in the issue tracker.**
+    -   If it does and the issue is still open, add a comment to the existing issue instead of opening a new one.
+    -   If you find a Closed issue that seems like it is the same thing that you're experiencing, open a new issue and include a link to the original issue in the body of your new one.
+-   If the issue is with the search functionality:
+    -   **Make sure you have [`python`][python-url] installed correctly (remember the search functionality requires a working python installation).**
+    -   Make sure it is in fact a problem with the search functionality itself, and not a problem with the plugins. If something does not work properly with the search functionality, the first step is to rule out search plugin-related issues.
+        -   For search plugin issues, report on the respective search plugin support page, or at [qbittorrent/search-plugins][search-plugins-url].
+
+## Steps to ensure a good bug report
+
+**Follow these guidelines** in order to provide as much useful information as possible right away. Not all of them are applicable to all issues, but you are expected to follow most of these steps (use common sense).
+Otherwise, we've noticed that a lot of your time (and the developers') gets thrown away on exchanging back and forth to get this information.
+
+*   Use a **clear and descriptive title** for the issue to identify the problem.
+
+*   Post only **one specific issue per submission.**
+
+*   **Fill out the issue template properly.**
+
+-   **Make sure you are using qBittorrent on a supported platform.** Do not submit issues which can only be reproduced on beta/unsupported releases of supported operating systems (e.g. Windows 10 Insider, Ubuntu 12.04 LTS, etc).
+These are unstable/unsupported platforms, and in all likelihood, whatever the issue is, it is not related to qBittorrent.
+
+*   **Specify the OS you're using, its version and architecture.**
+    *   Examples: Windows 8.1 32-bit, Linux Mint 17.1 64-bit, Windows 10 Fall creators Update 64-bit, etc.
+
+
+*   **Report only if you run into the issue with an official stable release, a beta release, or with the most recent upstream changes (in this last case specify the specific commit you are on).** (beta testing is encouraged :smile:). We do not provide support for bugs on unofficial Windows builds.
+
+*   **Specify the version of qBittorrent** you are using, as well as its **architecture** (x86 or x64) and its **libraries' versions** (Help -> About -> Libraries).
+
+*   Specify **how you installed**:
+    -   Linux: either from the PPA, your distribution's repositories, or compiled from source, or even possibly third-party repositories.
+    -   Windows: either from the installer, or compiled from source, or even possibly third-party repositories.
+    -   macOS: either from the installer, or compiled from source, or even possibly third-party repositories.
+
+
+*   **Describe the exact steps which reproduce the problem in as many details as possible.**
+    -   For example, start by explaining how you started qBittorrent, e.g. was it via the terminal? Desktop icon? Did you start it as root or normal user?
+    -   **When listing steps, don't just say what you did, but explain how you did it.**
+        -   For example, if you added a torrent for download, did you do so via a `.torrent` file or via a magnet link? If it was with a torrent file did you do so by dragging the torrent file from the file manager to the transfer list, or did you use the "Add Torrent File" in the Top Bar?
+    -   Describe the behavior you observed after following the steps and point out what exactly is the problem with that behavior; this is what we'll be looking for after executing the steps.
+
+
+*   **Explain which behavior you expected to see instead** and why.
+
+*   Use **screenshots/animated GIFs to help describe the issue** whenever appropriate [(How?)][attachments-howto-url].
+
+*   If the problem wasn't triggered by a specific action, describe what you were doing before the problem happened.
+
+*   **If you are reporting that qBittorrent crashes**, include the stack trace in the report; include it in a code block, a file attachment, or put it in a gist and provide link to that gist.
+
+*   **For performance-related issues**, include as much profiling data as you can (resource usage graphs, etc).
+
+*   Paste the **qBittorrent log** (or put the contents of the log in a gist and provide a link to the gist). The log can be viewed in the GUI (View -> Log -> tick all boxes). If you can't do that, the file is at:
+    -   Linux: `~/.local/share/data/qBittorrent/logs/qBittorrent.log`
+    -   Windows: `%LocalAppData%\qBittorrent\logs`
+    -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
+
+
+*   **Do NOT post comments like "+1" or "me too!"** without providing new relevant info on the issue. Using the built-in reactions is OK though. Remember that you can use the "subscribe" button to receive notifications of that report without having to comment first.
+
+*   If there seems to be an **issue with specific torrent files/magnet links**:
+    -   Don't post private `.torrent` files/magnet links, or ones that point to copyrighted content. If you are willing, offer to email a link or the `.torrent` file itself to whoever developer is debugging it and requests it.
+    -   Make sure you can't reproduce the problem with another client, to rule out the possibility that the issue is with the `.torrent` file/magnet link itself.
+
+
+*   A screenshot, transcription or file upload of any of **qBittorrent's preferences that differ from the defaults.** Please include everything different from the defaults whether or not it seems relevant to your issue.
+
+*   **Attachment rules**:
+    -   Short logs and error messages can be pasted as quotes/code whenever small enough; otherwise make a gist with the contents and post the link to the gist.
+    -   Avoid linking/attaching impractical file formats such as PDFs/Word documents with images. If you want to post an image, just post the image.
+
+### Provide more context by answering these questions (if applicable):
+
+-   Can you **reliably reproduce the issue?** If not, provide details about how often the problem happens and under which conditions it normally happens (e.g. only happens with extremely large torrents/only happens after qBittorrent is open for more than 2 days/etc...)
+
+-   Did the problem start happening recently (e.g. after updating to a new version of qBittorrent) or was this always a problem?
+
+-   If the problem started happening recently, can you reproduce the problem in an older version of qBittorrent?
+
+-   Are you saving files locally (in a disk in your machine), or are you saving them remotely (e.g. network drives)?
+
+-   Are you using qBittorrent with multiple monitors? If so, can you reproduce the problem when you use a single monitor?
+
+Good read: [How to Report Bugs Effectively][howto-report-bugs-url]
+
+# Suggesting enhancements/feature requests
+
+This section guides you through submitting an enhancement suggestion for qBittorrent, including completely new features and minor improvements to existing functionality.
+
+Following these guidelines helps maintainers and the community understand your suggestion and find related suggestions.
+
+## Before submitting an enhancement/feature request
+
+*   Check the [wiki][wiki-url] and [forum][forum-url] for tips — you might discover that the enhancement is already available.
+*   Most importantly, check if you're using the latest version of qBittorrent and if you can get the desired behavior by changing qBittorrent's settings.
+*   Check in the [releases][releases-url] page or on the [forum][forum-url], see if there's already a alpha/beta version with that enhancement.
+*   Perform a cursory search to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+
+## Steps to ensure a good enhancement/feature suggestion
+
+-   Specify which version of qBittorrent you're using.
+-   Specify the name and version of the OS you're using.
+-   Provide a step-by-step description of the suggested enhancement in as many details as possible.
+-   Describe the current behavior and explain which behavior you expected to see instead and why.
+-   Include screenshots and animated GIFs which help you demonstrate the steps or point out the part of qBittorrent which the suggestion is related to.
+-   If this enhancement exists in other BitTorrent clients, list those clients.
 
 # Opening a pull request
 
 ### Must read
-* Read our [**coding guidelines**](https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md). There are some scripts to help you: [uncrustify script](https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg), [astyle script](https://gist.github.com/Chocobo1/539cee860d1eef0acfa6), [(related thread)](https://github.com/qbittorrent/qBittorrent/issues/2192).
-* Keep the title **short** and provide a **clear** description about what your pull request does.
-* Provide **screenshots** for UI related changes.
-* Keep your git commit history **clean** and **precise**. Commits like `xxx fixup` should not appear.
-* If your commit fix a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here](https://github.com/qbittorrent/qBittorrent/commit/a74bac20c4e8de9776bf9bb77fdc7526135d1988).
+*   Read our [**coding guidelines**][coding-guidelines-url]. There are some scripts to help you: [uncrustify script][uncrustify-script-url], [astyle script][astyle-script-url], [(related thread)][coding-guidelines-thread-url].
+*   Keep the title **short** and provide a **clear** description about what your pull request does.
+*   Provide **screenshots** for UI related changes.
+*   Keep your git commit history **clean** and **precise.** Refer to the section about "Git commit messages" in the [**coding guidelines**][coding-guidelines-url].
+*   If your commit fixes a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here][commit-message-fix-issue-example-url].
 
 ### Good to know
-* **Search** pull request history! Others might already implemented your idea and is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
-* When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).
+*   **Search** pull request history! Others might have already implemented your idea and it is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
+*   When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link][merging-vs-rebasing-url].
+
+[astyle-script-url]: https://gist.github.com/Chocobo1/539cee860d1eef0acfa6
+[attachments-howto-url]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests
+[coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
+[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
+[commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
+[forum-url]: http://forum.qbittorrent.org/
+[howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+[merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
+[python-url]: https://www.python.org/
+[releases-url]: https://github.com/qbittorrent/qBittorrent/releases
+[search-plugins-url]: https://github.com/qbittorrent/search-plugins
+[uncrustify-script-url]: https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg
+[wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
+[builds-url]: https://sourceforge.net/projects/qbittorrent/files/

Changelog

@@ -1,3 +1,212 @@
+* Sun Aug 12 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.2
+    - FEATURE: New options for "inhibit sleep" (Lukas Greib)
+    - FEATURE: Add option for regexps in the transferlist search filter's context menu (thalieht)
+    - FEATURE: Add async io threads option to AdvancedSettings (tjjh89017)
+    - FEATURE: Allow save resume interval to be disabled (Chocobo1)
+    - FEATURE: Add checkbox for recursive download dialog (Chocobo1)
+    - FEATURE: Add changelog link in program updater (Chocobo1)
+    - BUGFIX: Avoid allocating large memory when loading a .torrent file (Couchy)
+    - BUGFIX: Notify users on 1st time close/minimize to tray (sledgehammer999)
+    - BUGFIX: Fix I/O error after fetching magnet metadata (Chocobo1)
+    - BUGFIX: Never save resume data for already paused torrents (glassez)
+    - BUGFIX: Make ProgramUpdater upgrade to 64-bit qbt when running on 64-bit Windows (Chocobo1)
+    - BUGFIX: Put temporary files in qbt own temp folder (Chocobo1)
+    - BUGFIX: Avoid potentially setting the wrong piece priorities (Chocobo1)
+    - BUGFIX: Various code refactorings/improvements (Chocobo1, thalieht, glassez)
+    - BUGFIX: Add options "Download in sequential order" and "Download first and last pieces first" in AddNewTorrentDialog (Chocobo1)
+    - BUGFIX: Download favicon using appropriate protocol (glassez)
+    - BUGFIX: Apply proxy settings on DownloadManager creation (glassez)
+    - BUGFIX: Improve torrent initialization (glassez)
+    - BUGFIX: Save resume data on torrent change events (glassez)
+    - BUGFIX: Increase default resume data save interval (Chocobo1)
+    - BUGFIX: Work around crash when procesing recursive download. Closes #9086 (Chocobo1)
+    - BUGFIX: Reduce queries to python version (Chocobo1)
+    - BUGFIX: Disable certain mouse wheel events in Options dialog (Chocobo1)
+    - WEBUI: Send all rechecks in one request (Thomas Piccirello)
+    - WEBUI: Add WebUI Force Reannounce option (Thomas Piccirello)
+    - WEBUI: Create non-existing path in setLocationAction() (Goshik)
+    - WEBUI: Add WebUI support for Mac ⌘ (Command) key (Thomas Piccirello)
+    - WEBUI: Show current save path in 'Set location' window (Goshik)
+    - WEBUI: Fix WebUI cache behavior for css files (Chocobo1)
+    - WEBUI: Send Cache-Control header in WebUI responses (Chocobo1)
+    - WEBUI: Add form-action to CSP (Thomas Piccirello)
+    - WEBUI: Add upgrade-insecure-requests to CSP when HTTPS is enabled (Thomas Piccirello)
+    - WEBUI: Reset WebUI ban counter on login success (Chocobo1)
+    - WEBUI: Add logging messages in WebUI login action (Chocobo1)
+    - WEBUI: Add option to control CSRF protection (Chocobo1)
+    - WEBUI: Add option to control WebUI clickjacking protection (Chocobo1)
+    - RSS: Implement "Sequential downloading" feature. Closes #6835 (glassez)
+    - RSS: Don't use RSS feed URLs as base for file names. Closes #8399 (glassez)
+    - SEARCH: Add a name filter for search results (thalieht)
+    - SEARCH: Fix python version detection (Chocobo1)
+    - SEARCH: Clear python cache conditionally (Chocobo1)
+    - SEARCH: Properly normalize version string before parsing it (hannsen)
+    - WINDOWS: Turn on Control Flow Guard for MSVC builds (Chocobo1)
+    - MACOS: Replace deprecated function IOPMAssertionCreate() on macOS (Chocobo1)
+    - OTHER: Fix CMake build with QtSingleApplication. Fixes #9196 (Eugene Shalygin)
+
+* Sun May 27 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.1
+    - FEATURE: Add 'Moving' state for torrents being relocated/moved (sledgehammer999)
+    - FEATURE: Show rechecking progress (sledgehammer999)
+    - FEATURE: Add option to remember last used save path (glassez)
+    - FEATURE: Torrent name is also renamed if the content was renamed in the "Add New Torrent" dialog (glassez)
+    - FEATURE: Relax behavior of "Download first and last piece first". It applies to all files and not only to the previewable. (Chocobo1)
+    - BUGFIX: Fix issues with translatable strings (Chocobo1)
+    - BUGFIX: Fix displayed tracker messages (Chocobo1)
+    - BUGFIX: Make settings file recovery more robust (Chocobo1)
+    - BUGFIX: Retry saving settings when operation failed (Chocobo1)
+    - BUGFIX: Log successful torrent move (sledgehammer999)
+    - BUGFIX: Fix deletion of old logs (sledgehammer999)
+    - BUGFIX: Delete non-commited fastresume files (sledgehammer999)
+    - BUGFIX: Don't migrate torrents that have newer fastresumes (sledgehammer999)
+    - BUGFIX: Fix adding multiple torrents at once from WebUI (glassez)
+    - BUGFIX: Improve "Run External Program" behavior. On Windows, a backslash isn't appended to paths from path variables (Chocobo1)
+    - BUGFIX: Suppress multiple I/O errors for the same torrent (sledgehammer999)
+    - BUGFIX: Replace raster qbt logo with vector version (Chocobo1)
+    - WEBUI: Fix wrong API method names (glassez)
+    - WEBUI: Filter torrent info endpoint by hashes (Marcel Petersen)
+    - WEBUI: Fix invalid API calls in WebUI (glassez)
+    - WEBUI: Improve legacy API params handling (glassez)
+    - WEBUI: Fix params handling for some legacy API methods (glassez)
+    - WEBUI: Apply locale changes immediately in WebUI (Chocobo1)
+    - WEBUI: Use 32px icons for favicon (Chocobo1)
+    - WEBUI/RSS: Properly set RSS settings via API (glassez)
+    - RSS: Fix auto-downloading rule when Smart filter with regular Episode filter are used (glassez)
+    - RSS: Make "Ignoring days" to behave like other filters (glassez)
+    - RSS: Place "Use Smart Episode Filter" more correctly (glassez)
+    - RSS: Use RSS feed update time as a fallback (glassez)
+    - COSMETIC: Fix Stats dialog size (sledgehammer999)
+    - MACOS: Fix GUI scaling factor on macOS (Chocobo1)
+    - WINDOWS: Update icons (adem4ik)
+    - LINUX: Fix open destination folder with Nautilus > 3.28 (Evgeny Lensky)
+    - OTHER: Code improvements and refactoring (thalieht, Nick Korotysh, Chocobo1)
+
+* Sat May 05 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.1.0
+    - FEATURE: Add "Coalesce reads & writes" checkbox in advanced options (Chocobo1)
+    - FEATURE: Smart Filter for RSS (Stephen Dawkins)
+    - FEATURE: Possibility to configure at which speed a torrent is considered slow (thalieht)
+    - FEATURE: When creating a torrent you can choose to preserve the file order (toster, Chocobo1)
+    - FEATURE: A new, redesigned and refactored WebAPI (glassez)
+    - BUGFIX: Redefine CacheStatus.readRatio field. (Chocobo1)
+    - BUGFIX: Clarify some terms in stats dialog (Chocobo1)
+    - BUGFIX: Fix possible crash when using both share limits (thalieht)
+    - BUGFIX: Disable options when `Disable connections not supported by proxies` is enabled (Thomas Piccirello)
+    - BUGFIX: Add link to an explanation of `Disable connections not supported by proxies` (Thomas Piccirello)
+    - BUGFIX: Fix typo in a log message (Andrei Stepanov)
+    - BUGFIX: Fix loading very large torrents. Closes #8449. (Chocobo1)
+    - BUGFIX: Fix reverting backslashes to slashes in run external program. Closes #7800 (Chocobo1)
+    - BUGFIX: Use https for documentation links (Chocobo1)
+    - BUGFIX: Use original scheme when downloading favicons (Chocobo1)
+    - BUGFIX: Parse URL query string at application level (glassez)
+    - BUGFIX: Properly reply to announce request (embedded tracker) (glassez)
+    - BUGFIX: Add `Tags` parameter to "Run External Program" (Chocobo1)
+    - BUGFIX: Fix various typos (Chocobo1)
+    - BUGFIX: Refactor filesystem watcher. Delay before processing new files. (Chocobo1)
+    - BUGFIX: Don't strip empty arguments passed to external program. Closes #8454. (Chocobo1)
+    - BUGFIX: Stop creating Download folder on start (Chocobo1)
+    - BUGFIX: Avoid data corruption when rechecking paused torrents (sledgehammer999)
+    - BUGFIX: Fix crashes due to invalid iterator use (Luís Pereira)
+    - BUGFIX: Fix renaming completed files (Chocobo1)
+    - BUGFIX: Fix path separator in log messages (Chocobo1)
+    - WEBUI: Switch built-in Web UI html to HTML5 (glassez)
+    - WEBUI: WebUI Save user's resized window sizes (Thomas Piccirello)
+    - WEBUI: Make download + upload windows resizable (Thomas Piccirello)
+    - WEBUI: Add option to show/hide webui status bar (Thomas Piccirello)
+    - WEBUI: Add "Use proxy only for torrents" option to webui (Thomas Piccirello)
+    - WEBUI: Various fixes in the html code (Thomas Piccirello)
+    - WEBUI: Don't unselect selected torrents after a few seconds (Thomas Piccirello)
+    - WEBUI: Enable Http/1.1 persistence connection (Chocobo1)
+    - WEBUI: Format Read cache hits as percentage (Thomas Piccirello)
+    - WEBUI: Re-order and rename stats (Thomas Piccirello)
+    - WEBUI: Right align stat values (Thomas Piccirello)
+    - WEBUI: Enable Statistics window to be scrolled and resized (Tom Piccirello)
+    - WEBUI: Save WebUI Statistics window size (Thomas Piccirello)
+    - WEBUI: Make WebUI iframe windows scrollable on iOS (Thomas Piccirello)
+    - WEBUI: Remove unused CSS from WebUI login page (Thomas Piccirello)
+    - WEBUI: Consolidate CSS into style.css (Thomas Piccirello)
+    - WEBUI: Resolve JavaScript errors (Thomas Piccirello)
+    - WEBUI: Fix spacing in login form(Thomas Piccirello)
+    - WEBUI: Update WebUI to be more compliant with HTML5 standard (Chocobo1)
+    - WEBUI: Update clipboard.js to v2.0.0 (Chocobo1)
+    - WEBUI: Remove unused JavaScript library (Chocobo1)
+    - WEBUI: Fix setting preferences via WebAPI (glassez)
+    - WEBUI: Rename property to match its definition (Thomas Piccirello)
+    - WEBUI: Add Limit Share Ratio context menu option (Thomas Piccirello)
+    - RSS: Disable Auto TMM when RSS rule has save path (glassez)
+    - RSS: Process loaded RSS articles in case of error (glassez)
+    - RSS: Resolve (X)HTML entities in RSS content (glassez)
+    - SEARCH: Improve Search handling (glassez)
+    - SEARCH: Calculate supported categories based on selected plugin (Thomas Piccirello)
+    - SEARCH: Fix memory leak (Chocobo1)
+    - COSMETIC: Use spinbox suffix to display rate/time units (thalieht)
+    - COSMETIC: Avoid showing an empty row in AdvancedSettings (Chocobo1)
+    - OTHER: Various code optimizations and fixes (Luís Pereira, Chocobo1)
+    - OTHER: Fix build when using Clang under CMake (Luís Pereira)
+    - OTHER: Allow to disable Stacktrace support (Nick Korotysh)
+    - OTHER: Use RNG provided by OS (Chocobo1)
+
+* Fri Feb 16 2018 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.4
+    - FEATURE: Add source field in Torrent creator. Closes #7965. (Chocobo1)
+    - FEATURE: Torrent creator: raise maximum piece size to 32 MiB (Chocobo1)
+    - FEATURE: Add a force reannounce option in the transfer list context menu. Closes #6448. (Jesse Bryan)
+    - BUGFIX: Fix sorting of country flags column in Peers tab. (sledgehammer999)
+    - BUGFIX: Fix natural sorting when the common part of 2 strings ends partially in a number which continues in the uncommon part. Closes #8080 #6732. (sledgehammer999)
+    - BUGFIX: Fix application of speed limits on LAN and μTP connections. Closes #7745. (sledgehammer999)
+    - BUGFIX: Make peer information flags in peerlist more readable. (thalieht)
+    - BUGFIX: Fix gui issues on high DPI monitor. (Chocobo1)
+    - BUGFIX: Fix dialog and column size on high DPI monitors. (Chocobo1)
+    - BUGFIX: Fix constant status of '[F] Downloading'. Closes #7628. (sledgehammer999)
+    - BUGFIX: Fix translation context. Closes #8211. (sledgehammer999)
+    - BUGFIX: Separate subnet whitelist options into two lines. (Thomas Piccirello)
+    - BUGFIX: Don't set application name twice. (Luís Pereira)
+    - BUGFIX: Set default file log size to 65 KiB and delete backup logs older than 1 month. (sledgehammer999)
+    - WEBUI: Only prepend scheme when it is not present. Closes #8057. (Chocobo1)
+    - WEBUI: Add "Remaining" and "Availability" columns to webui Content tab. (Thomas Piccirello)
+    - WEBUI: Make value formatting consistent with GUI (Thomas Piccirello)
+    - WEBUI: Reposition Total Size column to match gui (Thomas Piccirello)
+    - WEBUI: Add Tags and Time Active columns (Thomas Piccirello)
+    - WEBUI: Use https for www.qbittorrent.org (Thomas Piccirello)
+    - WEBUI: Match webui statuses to gui, closes #7516 (Thomas Piccirello)
+    - WEBUI: Right-align stat values (Thomas Piccirello)
+    - WEBUI: Add missing units. (Thomas Piccirello)
+    - RSS: Fix crash when deleting rule because it tries to update. Closes #8094 (glassez)
+    - RSS: Don't process new/updated RSS rules when disabled (glassez)
+    - RSS: Remove legacy and corrupted RSS settings (glassez)
+    - SEARCH: Search only when category is supported by plugin. Closes #8053. (jan.karberg)
+    - SEARCH: Only add search separators as needed. (Thomas Piccirello)
+    - COSMETIC: Tweak spacing in torrent properties widget and speed widget. (Chocobo1)
+    - WINDOWS: Use standard folder icon for open file behavior on Windows. Closes #7880. (Chocobo1)
+    - WINDOWS: Revert "Run external program" function. Now you will not be able to directly run batch scripts. (Chocobo1)
+    - MACOS: Fix torrent file selection in Finder on mac (vit9696)
+    - MACOS: Fix Finder reveal in preview and torrent contents (vit9696)
+    - MACOS: Fix cmd+w not closing the main window on macOS (vit9696)
+    - OTHER: Fix splitting of compiler flags in configure. Autoconf removes a set of [] during script translation, resulting in a wrong sed command. (sledgehammer999)
+    - OTHER: configure: Parse all compiler related flags together. (sledgehammer999)
+    - OTHER: Update copyright year. (sledgehammer999)
+
+* Sun Dec 17 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.3
+    - BUGFIX: Add height padding to the transfer list icons. Closes #7951. (sledgehammer999)
+    - BUGFIX: Allow to drag-n-drop URLs into mainwindow to initiate download. (Chocobo1)
+    - BUGFIX: Fix crash when fitlering search results. Stable sorting is removed. Closes #7952.(Chocobo1)
+    - WEBUI: Fix missing qbt logo on login page in webUI. Closes #7953. (Chocobo1)
+    - WEBUI: Add check to avoid type error after logout. (Chocobo1)
+    - WEBUI: Use POST for logout command. This is to avoid browser being smart to prefetch the link then logging out the user. (Chocobo1)
+    - WEBUI: Fix WebUI is not reachable via IPv6. (glassez)
+    - WINDOWS: Disable the "?" help button in all dialogs on Windows. Closes #7365. Requires Qt 5.10. (Chocobo1)
+
+* Fri Dec 01 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.2
+    - BUGFIX: Fix crash on some systems when creating address object for 255.255.255.255. Closes #7735. (sledgehammer999)
+    - PERFORMANCE: Change MixedModeAlgorithm default to TCP. This was the v3_3_x default and should sustain higher speeds. Closes #7779. (Chocobo1)
+    - PERFORMANCE: Stop logging IP filter parsing errors after a while, otherwise the GUI freezes or qBittorrent doesn't start. (sledgehammer999)
+    - GUI: Implement stable sort. Rows in transfer list shouldn't flicker anymore. (Chocobo1)
+    - WEBUI: Fix build when webui is disabled. (Heiko Becker)
+    - RSS: Fix build because of missing header. Closes #7805. (thoradia)
+    - RSS: Fix RSS parser. (glassez)
+    - RSS: Implement Import/Export RSS rules in legacy(aka v3_3_x) format. (glassez)
+    - RSS: Implement Import/Export RSS rules in JSON format. (glassez)
+    - WINDOWS: Fixed blurry text under Windows by setting DPI awareness to default. (TheNicker)
+    - LINUX: Fix i386 build. (Evgeny Lensky)
+
 * Wed Nov 22 2017 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.0.1
     - BUGFIX: Fix crash on opening torrent/magnet (uninitialized pointer). Closes #7739 #7723. (sledgehammer999)
     - BUGFIX: Enable preferences Apply button when ip banlist is modified (Thomas Piccirello)
@@ -60,7 +269,7 @@
     - BUGFIX: Optimize code for SpeedWidget. (dzmat)
     - BUGFIX: Disable processing events when adding torrents(prevents crashes). Closes #7436. (Chocobo1)
     - BUGFIX: Open links in browser. Closes #7651. (Chocobo1)
-    - BUGFIX: Change default settings for tracker/tier announces to mimick μTorrent behavior. (sledgehammer999)
+    - BUGFIX: Change default settings for tracker/tier announces to mimic μTorrent behavior. (sledgehammer999)
     - BUGFIX: Explicitly set UPnP state on start-up. Closes #7338. (Chocobo1)
     - BUGFIX: Include/print caught signal in stackdump (Chocobo1)
     - COSMETIC: Trackerlist: Set text alignment of columns with numbers to the right (thalieht)
@@ -191,7 +400,7 @@
     - FEATURE: Use Ctrl+F to search torrents. Closes #5797. (Tim Delaney)
     - FEATURE: Transferlist: add hotkeys for double click and recheck selected torrents (thalieht)
     - FEATURE: Add hotkey for execution log tab, Trackerlist, Peerlist etc (thalieht)
-    - FEATURE: Seperate seeds from peers for DHT, PeX and LSD (thalieht)
+    - FEATURE: Separate seeds from peers for DHT, PeX and LSD (thalieht)
     - BUGFIX: Do not remove added files unconditionally. Closes #6248 (Eugene Shalygin)
     - BUGFIX: Ignore mouse wheel events in Advanced Settings. Closes #866. (Chocobo1)
     - BUGFIX: Add queue repair code. It should fix missing torrents after restarting. (Eugene Shalygin, nxd4)
@@ -203,7 +412,7 @@
     - BUGFIX: TransferListWidget: keep columns width even if they are hidden on qBittorrent startup (unless something goes wrong) (thalieht)
     - BUGFIX: fix index overflow for torrents with invalid meta data or empty progress (Falco)
     - BUGFIX: Immediately update torrent_status after manipulating super seeding mode. Partially fixes #6072. (sledgehammer999)
-    - BUGFIX: Use case-insensitive comparsion for torrent content window. Closes #6327. (Chocobo1)
+    - BUGFIX: Use case-insensitive comparison for torrent content window. Closes #6327. (Chocobo1)
     - BUGFIX: Fixed sort order for datetime columns with empty values (closes #2988) (Vladimir Sinenko)
     - BUGFIX: Disable proxy in WebUI HTTP server. Closes #6349. (Eugene Shalygin)
     - COSMETIC: Use a disabled progressbar's palette for unselected files. (sledgehammer999)
@@ -331,12 +540,12 @@
     - FEATURE: Add option to automatically remove .torrent files upon adding (Eugene Shalygin)
     - FEATURE: Add option to bind directly to an IP instead of using a network Interface (Sjoerd van der Berg, sledgehammer999)
     - FEATURE: Detailed tooltips on the progress and availability bars in the General button of each torrent. (Eugene Shalygin)
-    - FEATURE: Let user able to specifiy a filter when choosing an IP filter file (Chocobo1)
+    - FEATURE: Let user able to specify a filter when choosing an IP filter file (Chocobo1)
     - FEATURE: Improve usability of "Run External Program". Users can write (platform dependent) shell scripts now. (Chocobo1)
     - PERFORMANCE: Optimize drawing in speed graph (Anton Lashkov, Chocobo1)
     - BUGFIX: Fix memory leak. (sledgehammer999)
     - BUGFIX: Fix resizing bug in "add torrent dialog". Closes #5036. (Chocobo1)
-    - BUGFIX: Fix qBittorrent doesn't exit immediately when "all donwloads are done -> exit" option enabled. (glassez, Chocobo1)
+    - BUGFIX: Fix qBittorrent doesn't exit immediately when "all downloads are done -> exit" option enabled. (glassez, Chocobo1)
     - BUGFIX: Display the filepath when a torrent fails to load. Closes #100 and #805. (sledgehammer999)
     - BUGFIX: Fix Add tracker dialog empty trackers (ngosang)
     - BUGFIX: Fix Add tracker dialog URL download (ngosang)
@@ -389,7 +598,7 @@
     - OTHER: Enable access to shutdown functions when configured with `--disable-gui` option (Chocobo1)
     - OTHER: Delete Import Torrent Dialog. Just use the "add new torrent" dialog. (glassez)
     - OTHER: Optimize code for natural sorting (Chocobo1)
-    - OTHER: Use new alert dispathing API for libtorrent 1.1.x (glassez)
+    - OTHER: Use new alert dispatching API for libtorrent 1.1.x (glassez)
     - OTHER: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999)
 
 * Tue Mar 29 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.4
@@ -713,7 +922,7 @@
     - SEARCH: Fix thepiratebay. Closes #3012 (ngosang)
     - SEARCH: Improve torrentz engine to return more results (ngosang)
     - SEARCH: Change width of columns in search tab. Closes #764 (ngosang)
-    - SEARCH: Make strings translatable in seach engine (ngosang)
+    - SEARCH: Make strings translatable in search engine (ngosang)
     - SEARCH: Aborting search engine process during closure. Close #2671 (DoumanAsh)
     - SEARCH: Perform searches in parallel (DoumanAsh)
     - SEARCH: Add Demonoid search engine (ngosang)
@@ -880,7 +1089,7 @@
     - WEBUI: Removed broken 'Documentation'. Improves fix for #1343 (Benjamin Hutchins)
     - WEBUI: Removed essentially useless 'Visit website' iframe and changed it to a regular link. Improves fix for #1343 (Benjamin Hutchins)
     - BUGFIX: Fix RSS feed icon. The tmp file gets deleted in the feed destructor. Closes #1639 (sledgehammer999)
-    - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "dont ask me again" is set (Ivan Sorokin)
+    - BUGFIX: fix issue #1674: AddNewTorrentDialog is shown again and again even if checkbox "don't ask me again" is set (Ivan Sorokin)
     - BUGFIX: Don't show availability bar for magnet links (Ivan Sorokin)
     - BUGFIX: Fix crash when the selected torrent disappears from the transfer list. Closes #1661 (sledgehammer999)
     - BUGFIX: Fix tracker announcing problem(hit-and-run) when many torrents are being active. Closes #1571 (sledgehammer999)
@@ -1014,7 +1223,7 @@
     - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999)
     - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999)
     - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999)
-    - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999)
+    - FEATURE: Re-enable "force reannounce" to all trackers. (sledgehammer999)
     - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999)
     - FEATURE: New translations: English(Australia) and English(United Kingdom)
     - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999)
@@ -1063,8 +1272,8 @@
     - OTHER: Make peer tab sortable by ip too (Gelmir)
     - OTHER: Translations moved to Transifex(https://www.transifex.com/projects/p/qbittorrent/)
     - OTHER: New Translation - Vietnamese (Anh Phan)
-    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100)
-    - PERFORMANCE: Impove drawing speed of peers list when there are many peers
+    - PERFORMANCE: Improve drawing speed of tranferlist when there are many torrents(>100)
+    - PERFORMANCE: Improve drawing speed of peers list when there are many peers
 
 * Mon Jul 29 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.0.11
     - FEATURE: Allow more fine tuning of upload slots. It should improve speed (sledgehammer999)
@@ -1104,8 +1313,8 @@
     - LIBTORRENT: SOCKS5 fixes (0.16.10)
     - LIBTORRENT: Fix hanging issue on Windows when closing files (0.16.10)
     - LIBTORRENT: Cache can now be returned to the OS (0.16.10)
-    - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999)
-    - PERFORMANCE: Impove drawing speed of peers list when there are many peers (sledgehammer999)
+    - PERFORMANCE: Improve drawing speed of tranferlist when there are many torrents(>100) (sledgehammer999)
+    - PERFORMANCE: Improve drawing speed of peers list when there are many peers (sledgehammer999)
     
 * Sat Mar 16 2013 - Christophe Dumez <chris@qbittorrent.org> - v3.0.9
     - BUGFIX: Raise qBittorrent windows when another instance is launched
@@ -1129,7 +1338,7 @@
     - BUGFIX: Fix "Couldn't set environment variable..." message on start up (closes #245)
     - BUGFIX: Use right path separator in torrent addition dialog on Windows
     - BUGFIX: Fix "Set as default save path" setting (closes #254)
-    - BUGFIX: Reenable disk cache on Windows since the memory issue seems to be gone
+    - BUGFIX: Re-enable disk cache on Windows since the memory issue seems to be gone
     - BUGFIX: Fixed several search engine plugins and removed the dead ones
     - BUGFIX: Use https links in search plugins when possible
     - BUGFIX: Bump Mootools to v1.4.5 (Web UI)
@@ -1265,7 +1474,7 @@
     - I18N: Add Georgian translation
 
 * Sat Oct 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.2
-    - BUGFIX: Fix mimimum dimensions for torrent addition dialog
+    - BUGFIX: Fix minimum dimensions for torrent addition dialog
     - BUGFIX: Remove dependency on boost-datetime
     - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x)
 
@@ -1476,7 +1685,7 @@
     - BUGFIX: Update RSS feed as soon as feed downloader is enabled
     - BUGFIX: RSS Feed downloader ignores articles above maximum number of articles
     - BUGFIX: Fix possible bug when deleting a RSS folder
-    - BUGFIX: Remove persistant data when a RSS feed is deleted
+    - BUGFIX: Remove persistent data when a RSS feed is deleted
     - BUGFIX: RSS filters are now alphabetically sorted
     - BUGFIX: Fix crash when renaming currently displayed RSS filter
     - BUGFIX: Remove overwriting confirmation when exporting RSS filters since Qt takes care of it
@@ -1512,7 +1721,7 @@
     - BUGFIX: Use the save path set in program preferences as a default in torrent addition dialog
 
 * Fri Dec 18 2009 - Christophe Dumez <chris@qbittorrent.org> - v2.0.2
-    - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusuable for new users)
+    - BUGFIX: Fix .qbittorrent folder not being created (critical bug introduced in v2.0.1 that makes qBittorrent unusable for new users)
     - BUGFIX: Fix RSS Feed downloader for some feeds
     - BUGFIX: Do not use home folder as a fallback when the save path is not accessible
     - BUGFIX: Fix Mininova, ThePirateBay search engine plugins
@@ -1602,7 +1811,7 @@
   - BUGFIX: Fix trackers addition to torrents (bug introduced in v1.5.4)
   - BUGFIX: Suppress compilation warning regarding sortNewsList() not being used
   - BUGFIX: Make sure scan folder is different than qBittorrent backup directory to avoid torrents deletion
-  - BUGFIX: Added safety mecanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted.
+  - BUGFIX: Added safety mechanism which adds the torrents back to the list in case qbittorrent-resume.conf gets deleted or corrupted.
 
 * Sun Oct 25 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.5.4
   - BUGFIX: Updated man page
@@ -1669,7 +1878,7 @@
     - FEATURE: Added right click menu in search engine to clear completion history
     - FEATURE: Allow to set a different port for DHT (UDP) than the one used for Bittorrent
     - FEATURE: Updated spoofing code to avoid trackers ban
-    - BUGFIX: Provide more helpful explanation when an I/O error occured
+    - BUGFIX: Provide more helpful explanation when an I/O error occurred
     - BUGFIX: Stop enforcing UTF-8 and use system locale instead
     - COSMETIC: Redesigned program preferences
     - COSMETIC: Updated icons set
@@ -1687,7 +1896,7 @@
     - BUGFIX: Suppressed QLayout: Attempting to add QLayout "" to properties "properties" warning message when opening a properties dialog
     - BUGFIX: Fixed a little bug in search engine plugins helper file
     - BUGFIX: Fixed compilation problems with Qt 4.3
-    - BUGFIX: Percentages no longer disapear with default cleanlooks style
+    - BUGFIX: Percentages no longer disappear with default cleanlooks style
     - BUGFIX: Cleanly fixed popup menus position in lists (no more workarounds)
     - BUGFIX: Fixed memory leak in search engine
     - BUGFIX: Torrents with an infinite ratio are no longer affected by ratio_limit set in program preferences
@@ -1932,7 +2141,7 @@
     - FEATURE: Number of complete/incomplete sources are now displayed in download list for each torrent
     - FEATURE: Implemented close to systray
     - FEATURE: Added Autocompletion to search engine
-    - FEATURE: Splitted BT & GUI parts (huge code rewriting & optimization)
+    - FEATURE: Split BT & GUI parts (huge code rewriting & optimization)
     - FEATURE: New parameters for configure file to point to custom locations for libtorrent/libcurl
     - FEATURE: Update application style according to the system (WindowsXP, MacOS, X11)
     - BUGFIX: Two torrents can now have the same name although they are different (use their hash)

README.md

@@ -35,7 +35,7 @@ You can also download it from [here](https://github.com/qbittorrent/qBittorrent/
 
 ### Misc:
 For more information please visit:
-http://www.qbittorrent.org
+https://www.qbittorrent.org
 
 or our wiki here:
 http://wiki.qbittorrent.org

cmake/Modules/CompileFeature.cmake

@@ -0,0 +1,22 @@
+# Helper function for coupling add_feature_info(), option(), and add_definitions()
+
+function(optional_compile_definitions _name)
+    set(options FEATURE)
+    set(oneValueArgs DESCRIPTION DEFAULT)
+    set(multiValueArgs ENABLED DISABLED)
+    cmake_parse_arguments(OCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    option(${_name} "${OCD_DESCRIPTION}" ${OCD_DEFAULT})
+    if (${${_name}})
+        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_ENABLED})
+    else()
+        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_DISABLED})
+    endif()
+    if(${OCD_FEATURE})
+        add_feature_info(${_name} ${_name} "${OCD_DESCRIPTION}")
+    endif()
+endfunction()
+
+macro(feature_option _name _description _default)
+    option(${_name} "${_description}" ${_default})
+    add_feature_info(${_name} ${_name} "${_description}")
+endmacro()

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -99,6 +99,7 @@ list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRaster
 if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
     find_package(OpenSSL REQUIRED)
     set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
+    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
     set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
 endif()
 
@@ -113,10 +114,10 @@ mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
     LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
     LibtorrentRasterbar_ENCRYPTION_INDEX)
 
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent)
-    add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED)
+if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
+    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
 
-    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
+    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
         IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
         INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"

cmake/Modules/FindQtSingleApplication.cmake

@@ -1,94 +1,79 @@
 # - Try to find the QtSingleApplication includes and library
 # which defines
 #
-# QTSINGLEAPPLICATION_FOUND - system has QtSingleApplication
-# QTSINGLEAPPLICATION_INCLUDE_DIR - where to find header QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARIES - the libraries to link against to use QtSingleApplication
-# QTSINGLEAPPLICATION_LIBRARY - where to find the QtSingleApplication library (not for general use)
+# QtSingleApplication_FOUND - system has QtSingleApplication
+# QtSingleApplication_INCLUDE_DIR - where to find header QtSingleApplication
+# QtSingleApplication_LIBRARIES - the libraries to link against to use QtSingleApplication
+# QtSingleApplication_LIBRARY - where to find the QtSingleApplication library (not for general use)
 
 # copyright (c) 2013 TI_Eugene ti.eugene@gmail.com
 #
 # Redistribution and use is allowed according to the terms of the FreeBSD license.
 
-SET(QTSINGLEAPPLICATION_FOUND FALSE)
+SET(QtSingleApplication_FOUND FALSE)
 
-IF(QT4_FOUND)
-    message(STATUS "Looking for Qt4 single application library")
-    FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication
-                # standard locations
-                /usr/include
-                /usr/include/QtSolutions
-                # qt4 location except mac's frameworks
-                "${QT_INCLUDE_DIR}/QtSolutions"
-                # mac's frameworks
-                ${FRAMEWORK_INCLUDE_DIR}/QtSolutions
-    )
+if (Qt5Widgets_FOUND)
+    set(_includeFileName qtsingleapplication.h)
+else()
+    set(_includeFileName qtsinglecoreapplication.h)
+endif()
 
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${QT_LIBRARY_DIR}
-    )
-ELSEIF(Qt5Core_FOUND)
-    message(STATUS "Looking for Qt5 single application library")
-    FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
-        FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions)
+FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR})
+    FIND_PATH(QtSingleApplication_INCLUDE_DIR ${_includeFileName} ${TOP_INCLUDE_PATH}/QtSolutions)
 
-        IF(QTSINGLEAPPLICATION_INCLUDE_DIR)
-            BREAK()
-        ENDIF()
-    ENDFOREACH()
+    IF(QtSingleApplication_INCLUDE_DIR)
+        BREAK()
+    ENDIF()
+ENDFOREACH()
 
-    SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES}
-        Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
-        QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
-    GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
-    GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
+SET(QtSingleApplication_NAMES ${QtSingleApplication_NAMES}
+    Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6
+    QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6)
+GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION)
+GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH)
 
-    FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY
-        NAMES ${QTSINGLEAPPLICATION_NAMES}
-        PATHS ${_QT5_CORELIBRARYPATH}
-    )
-ENDIF()
+FIND_LIBRARY(QtSingleApplication_LIBRARY
+    NAMES ${QtSingleApplication_NAMES}
+    PATHS ${_QT5_CORELIBRARYPATH}
+)
 
-IF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
+IF (QtSingleApplication_LIBRARY AND QtSingleApplication_INCLUDE_DIR)
 
-    SET(QTSINGLEAPPLICATION_LIBRARIES ${QTSINGLEAPPLICATION_LIBRARY})
-    SET(QTSINGLEAPPLICATION_FOUND TRUE)
+    SET(QtSingleApplication_LIBRARIES ${QtSingleApplication_LIBRARY})
+    SET(QtSingleApplication_FOUND TRUE)
 
     IF (CYGWIN)
         IF(BUILD_SHARED_LIBS)
-        # No need to define QTSINGLEAPPLICATION_USE_DLL here, because it's default for Cygwin.
+        # No need to define QtSingleApplication_USE_DLL here, because it's default for Cygwin.
         ELSE(BUILD_SHARED_LIBS)
-        SET (QTSINGLEAPPLICATION_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC)
+        SET (QtSingleApplication_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC)
         ENDIF(BUILD_SHARED_LIBS)
     ENDIF (CYGWIN)
 
-ENDIF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR)
+ENDIF (QtSingleApplication_LIBRARY AND QtSingleApplication_INCLUDE_DIR)
 
-IF (QTSINGLEAPPLICATION_FOUND)
-  IF (NOT QtSingleApplication_FIND_QUIETLY)
-    MESSAGE(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARY}")
-    MESSAGE(STATUS "         includes: ${QTSINGLEAPPLICATION_INCLUDE_DIR}")
-  ENDIF (NOT QtSingleApplication_FIND_QUIETLY)
-ELSE (QTSINGLEAPPLICATION_FOUND)
+IF (QtSingleApplication_FOUND)
+    IF (NOT QtSingleApplication_FIND_QUIETLY)
+        MESSAGE(STATUS "Found QtSingleApplication: ${QtSingleApplication_LIBRARY}")
+        MESSAGE(STATUS "         includes: ${QtSingleApplication_INCLUDE_DIR}")
+    ENDIF (NOT QtSingleApplication_FIND_QUIETLY)
+    if(NOT TARGET QtSingleApplication::QtSingleApplication)
+        add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
+        set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${QtSingleApplication_INCLUDE_DIR}"
+            INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QtSingleApplication_INCLUDE_DIR}"
+        )
+        if(EXISTS "${QtSingleApplication_LIBRARY}")
+        set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${QtSingleApplication_LIBRARY}")
+        endif()
+    endif(NOT TARGET QtSingleApplication::QtSingleApplication)
+
+ELSE (QtSingleApplication_FOUND)
   IF (QtSingleApplication_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "Could not find QtSingleApplication library")
   ENDIF (QtSingleApplication_FIND_REQUIRED)
-ENDIF (QTSINGLEAPPLICATION_FOUND)
+ENDIF (QtSingleApplication_FOUND)
 
-MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY)
-
-if(NOT TARGET QtSingleApplication::QtSingleApplication)
-    add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED)
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}"
-    )
-    if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}")
-    set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}")
-    endif()
-endif(NOT TARGET QtSingleApplication::QtSingleApplication)
+MARK_AS_ADVANCED(QtSingleApplication_INCLUDE_DIR QtSingleApplication_LIBRARY)

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,5 +1,5 @@
 # - macro similar to target_link_libraries, which links Qt components
-# names of the components are pased in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
+# names of the components are passed in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
 # and the macro links Qt4 ones if QT4_FOUND is set or Qt5 ones if not
 
 macro (target_link_qt_components target)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -11,18 +11,17 @@ macro(qbt_set_compiler_options)
         #-Wshadow -Wconversion ?
         set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
             "-Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long"
-#			-fstack-protector-all
-            "-Werror -Wno-error=deprecated-declarations"
+            "-Wsign-conversion -Winvalid-pch -Wno-long-long"
+            #"-fstack-protector-all"
+            #"-Werror -Wno-error=deprecated-declarations"
         )
-        set (_GCC_COMMON_CXX_FLAGS  "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel"
+        set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
+            "-Woverloaded-virtual -Wold-style-cast"
             "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align"
-            "-Werror=overloaded-virtual"
-    # 		"-Weffc++"
-            "-Werror -Wno-error=cpp"
+            #"-Weffc++"
+            #"-Werror -Wno-error=cpp"
             # we should modify code to make these ones obsolete
-            "-Wno-error=sign-conversion -Wno-error=float-equal"
+            #"-Wno-error=sign-conversion -Wno-error=float-equal"
         )
 
         if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
@@ -54,6 +53,20 @@ macro(qbt_set_compiler_options)
             endif(${GLIBC_VERSION})
         endif (CMAKE_SYSTEM_NAME MATCHES Linux)
 
+        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # Clang 5.0 still doesn't support -Wstrict-null-sentinel
+            check_cxx_compiler_flag(-Wstrict-null-sentinel _STRICT_NULL_SENTINEL_IS_SUPPORTED)
+            if (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
+                list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+            endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
+
+            # Code should be improved to render this not needed
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function -Wno-error=inconsistent-missing-override")
+        else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+            # GCC supports it
+            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
+        endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
         string(REPLACE ";" " " _GCC_COMMON_C_AND_CXX_FLAGS_STRING "${_GCC_COMMON_C_AND_CXX_FLAGS}")
         string(REPLACE ";" " " _GCC_COMMON_CXX_FLAGS_STRING "${_GCC_COMMON_CXX_FLAGS}")
 

cmake/Modules/QbtTargetSources.cmake

@@ -1,16 +1,17 @@
-# a helper function which appends source to the main qBt target
-# sources file names are relative to the the ${qBittorrent_SOURCE_DIR}
+# a helper function which appends source to the target
+# sources file names are relative to the the target source dir
 
-function (qbt_target_sources)
-    set (_sources_rel "")
-    foreach (_source IN ITEMS ${ARGN})
-        if (IS_ABSOLUTE "${_source}")
-            set(source_abs "${_source}")
+function (qbt_target_sources _target _scope)
+    get_target_property(targetSourceDir ${_target} SOURCE_DIR)
+    set(sourcesRelative "")
+    foreach(source IN ITEMS ${ARGN})
+        if(IS_ABSOLUTE "${source}")
+            set(sourceAbsolutePath "${source}")
         else()
-            get_filename_component(_source_abs "${_source}" ABSOLUTE)
+            get_filename_component(sourceAbsolutePath "${source}" ABSOLUTE)
         endif()
-        file (RELATIVE_PATH _source_rel "${qbt_executable_SOURCE_DIR}" "${_source_abs}")
-        list (APPEND _sources_rel "${_source_rel}")
+        file(RELATIVE_PATH sourceRelativePath "${targetSourceDir}" "${sourceAbsolutePath}")
+        list(APPEND sourcesRelative "${sourceRelativePath}")
     endforeach()
-    target_sources (qBittorrent PRIVATE "${_sources_rel}")
-endfunction (qbt_target_sources)
+    target_sources(${_target} ${_scope} "${sourcesRelative}")
+endfunction(qbt_target_sources)

cmake/Modules/winconf-mingw.cmake

@@ -1,9 +1,9 @@
-if (STACKTRACE_WIN)
+if (STACKTRACE)
     if ("${WINXXBITS}" NOT STREQUAL "Win64")
         add_compile_options(-fno-omit-frame-pointer)
     endif ("${WINXXBITS}" NOT STREQUAL "Win64")
     link_libraries(libdbghelp  -Wl,--export-all-symbols)
-endif (STACKTRACE_WIN)
+endif (STACKTRACE)
 
 if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
     link_libraries(-Wl,--dynamicbase)

cmake/Modules/winconf-msvc.cmake

@@ -1,4 +1,4 @@
-if (STACKTRACE_WIN)
+if (STACKTRACE)
     if ("${WINXXBITS}" STREQUAL "Win64")
         add_compile_options(-Zi)
     else ("${WINXXBITS}" STREQUAL "Win64")
@@ -6,7 +6,7 @@ if (STACKTRACE_WIN)
         add_compile_options(-Oy-)
     endif ("${WINXXBITS}" STREQUAL "Win64")
     link_libraries(dbghelp.lib)
-endif (STACKTRACE_WIN)
+endif (STACKTRACE)
 
 # Enable Wide characters
 add_definitions(-DTORRENT_USE_WPATH)

conf.pri.windows

@@ -50,6 +50,8 @@ DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
 #DEFINES += BOOST_ASIO_SEPARATE_COMPILATION
 # Enable if building against libtorrent 1.0.x (RC_1_0) (dynamic linking)
 #DEFINES += BOOST_ASIO_DYN_LINK
+# Enable if encountered build error with boost version <= 1.59
+#DEFINES += BOOST_NO_CXX11_RVALUE_REFERENCES
 
 # Enable if building against libtorrent 1.1.x (RC_1_1)
 # built with this flag defined
@@ -58,4 +60,10 @@ DEFINES += BOOST_USE_WINAPI_VERSION=0x0501
 #DEFINES += TORRENT_LINKING_SHARED
 
 # Enable stack trace support
-CONFIG += strace_win
+CONFIG += stacktrace
+
+win32-msvc* {
+    QMAKE_CXXFLAGS += "/guard:cf"
+    QMAKE_LFLAGS += "/guard:cf"
+    QMAKE_LFLAGS_RELEASE += "/OPT:REF /OPT:ICF"
+}

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for qbittorrent v3.2.0alpha.
+# Generated by GNU Autoconf 2.69 for qbittorrent v4.1.2.
 #
 # Report bugs to <bugs.qbittorrent.org>.
 #
@@ -580,10 +580,10 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='qbittorrent'
 PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v3.2.0alpha'
-PACKAGE_STRING='qbittorrent v3.2.0alpha'
+PACKAGE_VERSION='v4.1.2'
+PACKAGE_STRING='qbittorrent v4.1.2'
 PACKAGE_BUGREPORT='bugs.qbittorrent.org'
-PACKAGE_URL='http://www.qbittorrent.org/'
+PACKAGE_URL='https://www.qbittorrent.org/'
 
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
@@ -717,6 +717,7 @@ enable_dependency_tracking
 enable_silent_rules
 with_qtsingleapplication
 enable_debug
+enable_stacktrace
 enable_gui
 enable_systemd
 enable_webui
@@ -1296,7 +1297,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 qbittorrent v3.2.0alpha to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1367,7 +1368,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of qbittorrent v3.2.0alpha:";;
+     short | recursive ) echo "Configuration of qbittorrent v4.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1382,6 +1383,7 @@ Optional Features:
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-debug          Enable debug build
+  --enable-stacktrace     Enable stacktrace feature (default=auto)
   --disable-gui           Disable the GUI for headless running. Disables
                           QtDBus and the GeoIP Database.
   --enable-systemd        Install the systemd service file (headless only).
@@ -1438,7 +1440,7 @@ Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <bugs.qbittorrent.org>.
-qbittorrent home page: <http://www.qbittorrent.org/>.
+qbittorrent home page: <https://www.qbittorrent.org/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1501,7 +1503,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-qbittorrent configure v3.2.0alpha
+qbittorrent configure v4.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1640,7 +1642,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 qbittorrent $as_me v3.2.0alpha, which was
+It was created by qbittorrent $as_me v4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3818,7 +3820,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='qbittorrent'
- VERSION='v3.2.0alpha'
+ VERSION='v4.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4189,6 +4191,14 @@ else
 fi
 
 
+# Check whether --enable-stacktrace was given.
+if test "${enable_stacktrace+set}" = set; then :
+  enableval=$enable_stacktrace;
+else
+  enable_stacktrace=auto
+fi
+
+
 # Check whether --enable-gui was given.
 if test "${enable_gui+set}" = set; then :
   enableval=$enable_gui;
@@ -4389,6 +4399,39 @@ $as_echo "$enable_debug" >&6; }
         as_fn_error $? "Unknown option \"$enable_debug\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
 esac
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the stacktrace feature" >&5
+$as_echo_n "checking whether to enable the stacktrace feature... " >&6; }
+
+case "x$enable_stacktrace" in #(
+  "xno") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace" ;; #(
+  "xyes") :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+               QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace" ;; #(
+  "xauto") :
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <execinfo.h>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+                QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; #(
+  *) :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_stacktrace" >&5
+$as_echo "$enable_stacktrace" >&6; }
+        as_fn_error $? "Unknown option \"$enable_stacktrace\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;;
+esac
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the GUI" >&5
 $as_echo_n "checking whether to enable the GUI... " >&6; }
 case "x$enable_gui" in #(
@@ -4636,7 +4679,6 @@ esac
 
 
 
-
 # Check whether --with-boost was given.
 if test "${with_boost+set}" = set; then :
   withval=$with_boost;
@@ -4705,9 +4747,8 @@ fi
     libsubdirs="lib64 libx32 lib lib64" ;; #(
   ppc64|s390x|sparc64|aarch64|ppc64le) :
     libsubdirs="lib64 lib lib64" ;; #(
-  libsubdirs="lib") :
-     ;; #(
   *) :
+    libsubdirs="lib"
      ;;
 esac
 
@@ -4973,6 +5014,40 @@ fi
 CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
+# add workaround for problematic boost version
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+# taken from ax_boost_base.m4
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/version.hpp>
+int
+main ()
+{
+(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < (106000))]));
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+
 
 
 # Check whether --with-boost-system was given.
@@ -5502,7 +5577,7 @@ extract() {
   new_line='
 '
   # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
-  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//')
+  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[:space:]]*//')
   SAVEIFS=$IFS
   IFS=$(printf "\n\b")
   for i in $string; do
@@ -5516,9 +5591,8 @@ extract() {
   IFS=$SAVEIFS
 }
 
-extract $CPPFLAGS
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"
 
 # Substitute the values of these vars in conf.pri.in
 
@@ -6100,7 +6174,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 qbittorrent $as_me v3.2.0alpha, which was
+This file was extended by qbittorrent $as_me v4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6152,13 +6226,13 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bugs.qbittorrent.org>.
-qbittorrent home page: <http://www.qbittorrent.org/>."
+qbittorrent home page: <https://www.qbittorrent.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v3.2.0alpha
+qbittorrent config.status v4.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7415,7 +7489,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 qbittorrent $as_me v3.2.0alpha, which was
+This file was extended by qbittorrent $as_me v4.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7467,13 +7541,13 @@ Configuration commands:
 $config_commands
 
 Report bugs to <bugs.qbittorrent.org>.
-qbittorrent home page: <http://www.qbittorrent.org/>."
+qbittorrent home page: <https://www.qbittorrent.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v3.2.0alpha
+qbittorrent config.status v4.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v3.2.0alpha], [bugs.qbittorrent.org], [], [http://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.1.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -24,6 +24,12 @@ AC_ARG_ENABLE(debug,
               [],
               [enable_debug=no])
 
+AC_ARG_ENABLE(stacktrace,
+              [AS_HELP_STRING([--enable-stacktrace],
+                              [Enable stacktrace feature (default=auto)])],
+              [],
+              [enable_stacktrace=auto])
+
 AC_ARG_ENABLE(gui,
               [AS_HELP_STRING([--disable-gui],
                               [Disable the GUI for headless running. Disables QtDBus and the GeoIP Database.])],
@@ -80,6 +86,23 @@ AS_CASE(["x$enable_debug"],
         [AC_MSG_RESULT([$enable_debug])
         AC_MSG_ERROR([Unknown option "$enable_debug". Use either "yes" or "no".])])
 
+AC_MSG_CHECKING([whether to enable the stacktrace feature])
+AS_CASE(["x$enable_stacktrace"],
+        ["xno"],
+              [AC_MSG_RESULT([no])
+              QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"],
+        ["xyes"],
+               [AC_MSG_RESULT([yes])
+               QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
+        ["xauto"],
+                [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <execinfo.h>]])],
+                [AC_MSG_RESULT([yes])
+                QBT_ADD_CONFIG="$QBT_ADD_CONFIG stacktrace"],
+                [AC_MSG_RESULT([no])
+                QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG stacktrace"])],
+        [AC_MSG_RESULT([$enable_stacktrace])
+        AC_MSG_ERROR([Unknown option "$enable_stacktrace". Use either "yes" or "no".])])
+
 AC_MSG_CHECKING([whether to enable the GUI])
 AS_CASE(["x$enable_gui"],
         ["xyes"],
@@ -145,6 +168,17 @@ AX_BOOST_BASE([1.35],
 CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS"
 LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
+# add workaround for problematic boost version
+AC_LANG_PUSH(C++)
+# taken from ax_boost_base.m4
+m4_define([DETECT_BOOST_VERSION_PROGRAM],
+    [AC_LANG_PROGRAM([[#include <boost/version.hpp>]],
+                     [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
+
+AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
+    [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
+AC_LANG_POP([C++])
+
 AX_BOOST_SYSTEM()
 AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
@@ -190,7 +224,7 @@ extract() {
   new_line='
 '
   # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
-  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[:space:]]*//')
+  string=$(echo " $*" | $SED -e "s: -:\\${new_line}:g" -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[[[:space:]]]*//')
   SAVEIFS=$IFS
   IFS=$(printf "\n\b")
   for i in $string; do
@@ -204,9 +238,8 @@ extract() {
   IFS=$SAVEIFS
 }
 
-extract $CPPFLAGS
+extract "$CFLAGS $CPPFLAGS $CXXFLAGS"
 QBT_ADD_DEFINES="$QBT_ADD_DEFINES $QBT_CONF_DEFINES"
-QBT_CONF_EXTRA_CFLAGS="$QBT_CONF_EXTRA_CFLAGS $CXXFLAGS"
 
 # Substitute the values of these vars in conf.pri.in
 AC_SUBST(QBT_CONF_INCLUDES)

dist/CMakeLists.txt

@@ -1,3 +1,5 @@
+find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
+
 if (APPLE)
     add_subdirectory(mac)
 else (APPLE)

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.1</string>
+	<string>4.1.2</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2017 The qBittorrent project</string>
+	<string>Copyright © 2006-2018 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/CMakeLists.txt

@@ -1,31 +1,37 @@
-if (SYSTEMD)
-    find_package(Systemd)
-    if (SYSTEMD_FOUND)
+if (NOT Qt5Widgets_FOUND)
+    feature_option(SYSTEMD "Install systemd service file (headless only)" OFF)
+    if (SYSTEMD)
+        if (NOT Systemd_SERVICES_INSTALL_DIR)
+            find_package(Systemd)
+            if (NOT Systemd_FOUND)
+                message(FATAL_ERROR "Could not locate systemd services install dir."
+                " Either pass -DSystemd_SERVICES_INSTALL_DIR=/path/to/systemd/services option or install systemd pkg-config")
+            endif(NOT Systemd_FOUND)
+        endif(NOT Systemd_SERVICES_INSTALL_DIR)
         set(EXPAND_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
         configure_file(systemd/qbittorrent-nox@.service.in ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service @ONLY)
         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service
-            DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
+            DESTINATION ${Systemd_SERVICES_INSTALL_DIR}
             COMPONENT data)
-    endif(SYSTEMD_FOUND)
-endif(SYSTEMD)
+    endif(SYSTEMD)
+endif()
 
-
-if (GUI)
+if (Qt5Widgets_FOUND)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent.1)
-else (GUI)
+else (Qt5Widgets_FOUND)
     list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent-nox.1)
-endif (GUI)
+endif (Qt5Widgets_FOUND)
 
 install(FILES ${MAN_FILES}
         DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
         COMPONENT doc)
 
-if (GUI)
+if (Qt5Widgets_FOUND)
     install(DIRECTORY menuicons/
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
             FILES_MATCHING PATTERN "*.png")
 
-    install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop
+    install(FILES qbittorrent.desktop
             DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
             COMPONENT data)
 

dist/unix/qbittorrent.appdata.xml

@@ -56,7 +56,7 @@
    </image>
     </screenshot>
   </screenshots>
-  <url type="homepage">http://www.qbittorrent.org/</url>
+  <url type="homepage">https://www.qbittorrent.org/</url>
   <update_contact>sledgehammer999@qbittorrent.org</update_contact>
   <developer_name>The qBittorrent Project</developer_name>
   <url type="bugtracker">http://bugs.qbittorrent.org/</url>

dist/windows/installer.nsi

@@ -86,7 +86,7 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "UninstallString" '"$INSTDIR\uninst.exe"'
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayIcon" '"$INSTDIR\qbittorrent.exe",0'
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "Publisher" "The qBittorrent project"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "URLInfoAbout" "http://www.qbittorrent.org"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "URLInfoAbout" "https://www.qbittorrent.org"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "DisplayVersion" "${PROG_VERSION}"
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoModify" 1
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qBittorrent" "NoRepair" 1

dist/windows/options.nsi

@@ -27,7 +27,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.0.1"
+!define PROG_VERSION "4.1.2"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
@@ -50,7 +50,7 @@ XPStyle on
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2017 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2018 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

dist/windows/qt.conf

@@ -2,4 +2,4 @@
 Translations = translations
 
 [Platforms]
-WindowsArguments = dpiawareness=1
+;WindowsArguments = dpiawareness=1

m4/ax_boost_base.m4

@@ -114,7 +114,7 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
     AS_CASE([${host_cpu}],
       [x86_64],[libsubdirs="lib64 libx32 lib lib64"],
       [ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"],
-      [libsubdirs="lib"],
+      [libsubdirs="lib"]
     )
 
     dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give

qbittorrent.pro

@@ -3,7 +3,6 @@ TEMPLATE = subdirs
 SUBDIRS += src
 
 include(version.pri)
-include(qm_gen.pri)
 
 # Make target to create release tarball. Use 'make tarball'
 tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
@@ -17,3 +16,11 @@ tarball.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
 tarball.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
 
 QMAKE_EXTRA_TARGETS += tarball
+
+# Translations included here (at top level) is to avoid regenerating the .qm files
+# every time when src.pro is processed
+include(src/lang/lang.pri)
+
+# For Qt Creator beautifier
+DISTFILES += \
+    uncrustify.cfg

qm_gen.pri

@@ -1,21 +0,0 @@
-TS_IN = $$fromfile(src/src.pro,TRANSLATIONS)
-TS_IN_NOEXT = $$replace(TS_IN,".ts","")
-
-isEmpty(QMAKE_LRELEASE) {
-    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
-    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-    unix {
-      equals(QT_MAJOR_VERSION, 5) {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
-      }
-    } else {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
-    }
-}
-
-message("Building translations")
-for(L,TS_IN_NOEXT) {
-    message("Processing $${L}")
-    system("$$QMAKE_LRELEASE -silent src/$${L}.ts -qm src/$${L}.qm")
-    !exists("src/$${L}.qm"):error("Building translations failed, cannot continue")
-}

src/CMakeLists.txt

@@ -1,40 +1,45 @@
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_STANDARD "11")
-add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
 
 include(MacroQbtCompilerSettings)
 qbt_set_compiler_options()
 
-include(MacroLinkQtComponents)
 include(QbtTargetSources)
 
+find_package(Boost ${requiredBoostVersion} REQUIRED)
 find_package(LibtorrentRasterbar REQUIRED)
 
-# Qt
-list(APPEND QBT_QT_COMPONENTS Core Network Xml)
-if (GUI)
-    list (APPEND QBT_QT_COMPONENTS Gui Svg Widgets)
-    if (WIN32)
-        list (APPEND QBT_QT_COMPONENTS WinExtras)
-    endif(WIN32)
-    if (APPLE)
-        list (APPEND QBT_GUI_OPTIONAL_LINK_LIBRARIES objc)
-        list (APPEND QBT_QT_COMPONENTS MacExtras)
-    endif (APPLE)
-endif (GUI)
-if (DBUS)
-    list (APPEND QBT_QT_COMPONENTS DBus)
-endif (DBUS)
-find_package(Qt5 5.5.1 COMPONENTS ${QBT_QT_COMPONENTS} REQUIRED)
+if (Boost_VERSION VERSION_LESS 106000)
+    add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
+endif()
 
-if (GUI AND APPLE)
-    # Fix MOC inability to detect macOS. This seems to only affect cmake.
-    # Relevant issue: https://bugreports.qt.io/browse/QTBUG-58325
-    set(CMAKE_AUTOMOC_MOC_OPTIONS ${CMAKE_AUTOMOC_MOC_OPTIONS} -DQ_OS_MAC)
-endif ()
+find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS Core Network Xml)
+find_package(Qt5Widgets ${requiredQtVersion})
+if (Qt5Widgets_FOUND)
+    find_package(Qt5DBus ${requiredQtVersion})
+else()
+    add_definitions(-DDISABLE_GUI)
+endif()
+
+set_package_properties(Qt5Widgets PROPERTIES
+    DESCRIPTION "Set of components for creating classic desktop-style UIs for the Qt5 framework"
+    PURPOSE "Enables qBittorrent GUI. Unneeded for headless configuration."
+    TYPE OPTIONAL
+)
+
+set_package_properties(Qt5DBus PROPERTIES
+    DESCRIPTION "Qt5 module for inter-process communication over the D-Bus protocol"
+    PURPOSE "Enables communication with other system components (e.g. notification service) via D-Bus. "
+    TYPE RECOMMENDED
+)
 
 set(CMAKE_AUTOMOC True)
 list(APPEND CMAKE_AUTORCC_OPTIONS -compress 9 -threshold 5)
+if (APPLE)
+    # Workaround CMake bug (autogen does not pass required parameters to moc)
+    # Relevant issue: https://gitlab.kitware.com/cmake/cmake/issues/18041
+    list(APPEND CMAKE_AUTOMOC_MOC_OPTIONS -DQ_OS_MAC -DQ_OS_DARWIN)
+endif ()
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -43,56 +48,34 @@ add_definitions(-DQT_NO_CAST_TO_ASCII)
 # Efficient construction for QString & QByteArray (Qt >= 4.8)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
-if (NOT GUI)
-    add_definitions(-DDISABLE_GUI -DDISABLE_COUNTRIES_RESOLUTION)
-endif (NOT GUI)
-
-if (NOT WEBUI)
-    add_definitions(-DDISABLE_WEBUI)
-endif (NOT WEBUI)
-
-if (STACKTRACE_WIN)
-    add_definitions(-DSTACKTRACE_WIN)
-endif(STACKTRACE_WIN)
-# nogui {
-#     TARGET = qbittorrent-nox
-# } else {
-#     CONFIG(static) {
-#         DEFINES += QBT_STATIC_QT
-#         QTPLUGIN += qico
-#     }
-#     TARGET = qbittorrent
-# }
-
-if (UNIX AND NOT APPLE)
-    add_compile_options(-Wformat -Wformat-security)
-endif ()
-
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+if (CMAKE_BUILD_TYPE MATCHES "Debug")
     message(STATUS "Project is built in DEBUG mode.")
-else (CMAKE_BUILD_TYPE STREQUAL "Debug")
+else()
     message(STATUS "Project is built in RELEASE mode.")
     message(STATUS "Disabling debug output.")
     add_definitions(-DQT_NO_DEBUG_OUTPUT)
-endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
-
-set(QBT_USE_GUI ${GUI})
-set(QBT_USE_WEBUI ${WEBUI})
+endif()
 
 configure_file(config.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-if (SYSTEM_QTSINGLEAPPLICATION)
-    find_package(QtSingleApplication REQUIRED)
-else (SYSTEM_QTSINGLEAPPLICATION)
+find_package(QtSingleApplication)
+set_package_properties(QtSingleApplication PROPERTIES
+    URL "https://code.qt.io/cgit/qt-solutions/qt-solutions.git/"
+    DESCRIPTION "Qt library to start applications only once per user"
+    TYPE RECOMMENDED
+    PURPOSE "Use the system qtsingleapplication library or shipped one otherwise"
+)
+
+if (NOT QtSingleApplication_FOUND)
     add_subdirectory(app/qtsingleapplication)
-endif (SYSTEM_QTSINGLEAPPLICATION)
+endif ()
 
 add_subdirectory(app)
 add_subdirectory(base)
 
-if (GUI)
+if (Qt5Widgets_FOUND)
     add_subdirectory(gui)
-endif (GUI)
+endif ()
 
 if (WEBUI)
     add_subdirectory(webui)

src/app/CMakeLists.txt

@@ -1,19 +1,27 @@
-project(qbt_executable)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(QBT_APP_HEADERS
+add_executable(qBittorrent
 application.h
 cmdoptions.h
 filelogger.h
-)
-
-set(QBT_APP_SOURCES
+upgrade.h
 application.cpp
 cmdoptions.cpp
 filelogger.cpp
 main.cpp
 )
 
+target_include_directories(qBittorrent PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+target_link_libraries(qBittorrent
+    PRIVATE
+        qbt_base
+)
+
+set_target_properties(qBittorrent
+    PROPERTIES
+        AUTOUIC True
+        AUTORCC True
+        MACOSX_BUNDLE True
+)
+
 # translations
 file(GLOB QBT_TS_FILES ../lang/*.ts)
 get_filename_component(QBT_QM_FILES_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/../lang" ABSOLUTE)
@@ -22,9 +30,9 @@ set_source_files_properties(${QBT_TS_FILES} PROPERTIES OUTPUT_LOCATION "${QBT_QM
 find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
 qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES})
 
-get_filename_component(_lang_qrc_src "${CMAKE_CURRENT_SOURCE_DIR}/../lang.qrc" ABSOLUTE)
-get_filename_component(_lang_qrc_dst "${CMAKE_CURRENT_BINARY_DIR}/../lang.qrc" ABSOLUTE)
-get_filename_component(_lang_qrc_dst_dir "${CMAKE_CURRENT_BINARY_DIR}/../" ABSOLUTE)
+get_filename_component(_lang_qrc_src "${CMAKE_CURRENT_SOURCE_DIR}/../lang/lang.qrc" ABSOLUTE)
+get_filename_component(_lang_qrc_dst "${CMAKE_CURRENT_BINARY_DIR}/../lang/lang.qrc" ABSOLUTE)
+get_filename_component(_lang_qrc_dst_dir "${CMAKE_CURRENT_BINARY_DIR}/../lang" ABSOLUTE)
 
 message(STATUS "copying ${_lang_qrc_src} -> ${_lang_qrc_dst}")
 file(COPY ${_lang_qrc_src} DESTINATION ${_lang_qrc_dst_dir})
@@ -35,8 +43,8 @@ foreach(qm_file ${QBT_QM_FILES})
 endforeach()
 
 set(QBT_APP_RESOURCES
-../icons.qrc
-../searchengine.qrc
+../icons/icons.qrc
+../searchengine/searchengine.qrc
 "${_lang_qrc_dst}"
 )
 
@@ -46,51 +54,41 @@ qt5_add_resources(QBT_APP_RESOURCE_SOURCE ${QBT_APP_RESOURCES})
 
 if (WIN32)
     if (MINGW)
-        list (APPEND QBT_APP_SOURCES ../qbittorrent_mingw.rc)
+        target_sources(qBittorrent PRIVATE ../qbittorrent_mingw.rc)
     else (MINGW)
-        list (APPEND QBT_APP_SOURCES ../qbittorrent.rc)
+        target_sources(qBittorrent PRIVATE ../qbittorrent.rc)
     endif (MINGW)
-    list(APPEND QBT_APP_SOURCES ../qbittorrent.exe.manifest)
+    target_sources(qBittorrent PRIVATE ../qbittorrent.exe.manifest)
 endif (WIN32)
 
-if (UNIX)
-    list(APPEND QBT_APP_HEADERS stacktrace.h)
-endif (UNIX)
+if (STACKTRACE)
+    if (UNIX)
+        target_sources(qBittorrent PRIVATE stacktrace.h)
+    else (UNIX)
+        target_sources(qBittorrent PRIVATE stacktrace_win.h)
+        if (Qt5Widgets_FOUND)
+            target_sources(qBittorrent PRIVATE stacktracedialog.h)
+        endif (Qt5Widgets_FOUND)
+    endif (UNIX)
+endif (STACKTRACE)
 
-if (STACKTRACE_WIN)
-    list(APPEND QBT_APP_HEADERS stacktrace_win.h)
-    if (GUI)
-        list(APPEND QBT_APP_HEADERS stacktrace_win_dlg.h)
-    endif (GUI)
-endif (STACKTRACE_WIN)
 
-# usesystemqtsingleapplication {
-#     nogui {
-#         CONFIG += qtsinglecoreapplication
-#     } else {
-#         CONFIG += qtsingleapplication
-#     }
-# } else {
-#     nogui {
-#         include(qtsingleapplication/qtsinglecoreapplication.pri)
-#     } else {
-#         include(qtsingleapplication/qtsingleapplication.pri)
-#     }
-# }
-
-# upgrade code
-list(APPEND QBT_APP_HEADERS upgrade.h)
-list(APPEND QBT_TARGET_LIBRARIES qbt_base)
-
-if (GUI)
-    list(APPEND QBT_TARGET_LIBRARIES qbt_searchengine qbt_gui)
-    include_directories(../gui
-        ${CMAKE_CURRENT_BINARY_DIR}/../gui
+if (Qt5Widgets_FOUND)
+    target_link_libraries(qBittorrent PRIVATE qbt_searchengine qbt_gui)
+    set_target_properties(qBittorrent
+        PROPERTIES
+            OUTPUT_NAME qbittorrent
+            WIN32_EXECUTABLE True
     )
-endif (GUI)
+else(Qt5Widgets_FOUND)
+    set_target_properties(qBittorrent
+        PROPERTIES
+            OUTPUT_NAME qbittorrent-nox
+    )
+endif (Qt5Widgets_FOUND)
 
 if (WEBUI)
-    list(APPEND QBT_TARGET_LIBRARIES qbt_webui)
+    target_link_libraries(qBittorrent PRIVATE qbt_webui)
 endif (WEBUI)
 
 # we have to include resources into the bundle
@@ -142,30 +140,11 @@ if (APPLE)
         PROPERTIES MACOSX_PACKAGE_LOCATION translations)
 endif (APPLE)
 
-add_executable(qBittorrent ${QBT_APP_HEADERS} ${QBT_APP_SOURCES} ${QBT_QM_FILES} ${QBT_APP_RESOURCE_SOURCE})
-if (GUI)
-    set_target_properties(qBittorrent
-        PROPERTIES
-            OUTPUT_NAME qbittorrent
-            WIN32_EXECUTABLE True
-    )
-else (GUI)
-    set_target_properties(qBittorrent
-        PROPERTIES
-            OUTPUT_NAME qbittorrent-nox
-    )
-endif (GUI)
-
-set_target_properties(qBittorrent
-    PROPERTIES
-        AUTOUIC True
-        AUTORCC True
-        MACOSX_BUNDLE True
-)
+target_sources(qBittorrent PRIVATE ${QBT_QM_FILES} ${QBT_APP_RESOURCE_SOURCE})
 
 get_target_property(QBT_EXECUTABLE_NAME qBittorrent OUTPUT_NAME)
 
-target_link_libraries(qBittorrent ${QBT_TARGET_LIBRARIES} QtSingleApplication::QtSingleApplication)
+target_link_libraries(qBittorrent PRIVATE ${QBT_TARGET_LIBRARIES} QtSingleApplication::QtSingleApplication)
 
 if (APPLE)
     set(qbt_BUNDLE_NAME ${QBT_EXECUTABLE_NAME})
@@ -186,6 +165,7 @@ install(TARGETS qBittorrent
     BUNDLE  DESTINATION .
     COMPONENT runtime)
 
-if (GUI AND APPLE)
+if (Qt5Widgets_FOUND AND APPLE)
+    find_package(Qt5Svg REQUIRED)
     include(bundle)
-endif (GUI AND APPLE)
+endif (Qt5Widgets_FOUND AND APPLE)

src/app/app.pri

@@ -25,12 +25,16 @@ SOURCES += \
     $$PWD/filelogger.cpp \
     $$PWD/main.cpp
 
-unix: HEADERS += $$PWD/stacktrace.h
-strace_win {
-    HEADERS += $$PWD/stacktrace_win.h
-    !nogui {
-        HEADERS += $$PWD/stacktrace_win_dlg.h
-        FORMS += $$PWD/stacktrace_win_dlg.ui
+stacktrace {
+    unix {
+        HEADERS += $$PWD/stacktrace.h
+    }
+    else {
+        HEADERS += $$PWD/stacktrace_win.h
+        !nogui {
+            HEADERS += $$PWD/stacktracedialog.h
+            FORMS += $$PWD/stacktracedialog.ui
+        }
     }
 }
 

src/app/application.cpp

@@ -27,77 +27,86 @@
  * exception statement from your version.
  */
 
-#include <QDebug>
-#include <QFileInfo>
-#include <QLocale>
-#include <QLibraryInfo>
-#include <QSysInfo>
-#include <QProcess>
+#include "application.h"
+
+#include <algorithm>
+
 #include <QAtomicInt>
+#include <QDebug>
+#include <QLibraryInfo>
+#include <QLocale>
+#include <QProcess>
+#include <QSysInfo>
+
+#ifdef Q_OS_WIN
+#include <memory>
+#include <Shellapi.h>
+#endif
 
 #ifndef DISABLE_GUI
-#include "gui/guiiconprovider.h"
 #ifdef Q_OS_WIN
-#include <windows.h>
-#include <QSharedMemory>
 #include <QSessionManager>
+#include <QSharedMemory>
 #endif // Q_OS_WIN
 #ifdef Q_OS_MAC
 #include <QFileOpenEvent>
-#include <QFont>
-#include <QUrl>
 #endif // Q_OS_MAC
-#include "mainwindow.h"
 #include "addnewtorrentdialog.h"
-#include "shutdownconfirmdlg.h"
+#include "gui/guiiconprovider.h"
+#include "mainwindow.h"
+#include "shutdownconfirmdialog.h"
 #else // DISABLE_GUI
-#include <iostream>
+#include <cstdio>
 #endif // DISABLE_GUI
 
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/torrenthandle.h"
+#include "base/iconprovider.h"
+#include "base/logger.h"
+#include "base/net/downloadmanager.h"
+#include "base/net/geoipmanager.h"
+#include "base/net/proxyconfigurationmanager.h"
+#include "base/net/smtp.h"
+#include "base/preferences.h"
+#include "base/profile.h"
+#include "base/rss/rss_autodownloader.h"
+#include "base/rss/rss_session.h"
+#include "base/scanfoldersmodel.h"
+#include "base/settingsstorage.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "filelogger.h"
+
 #ifndef DISABLE_WEBUI
 #include "webui/webui.h"
 #endif
 
-#include "application.h"
-#include "filelogger.h"
-#include "base/logger.h"
-#include "base/preferences.h"
-#include "base/settingsstorage.h"
-#include "base/profile.h"
-#include "base/utils/fs.h"
-#include "base/utils/misc.h"
-#include "base/iconprovider.h"
-#include "base/scanfoldersmodel.h"
-#include "base/net/smtp.h"
-#include "base/net/downloadmanager.h"
-#include "base/net/geoipmanager.h"
-#include "base/net/proxyconfigurationmanager.h"
-#include "base/bittorrent/session.h"
-#include "base/bittorrent/torrenthandle.h"
-#include "base/rss/rss_autodownloader.h"
-#include "base/rss/rss_session.h"
-
 namespace
 {
 #define SETTINGS_KEY(name) "Application/" name
 
     // FileLogger properties keys
-#define FILELOGGER_SETTINGS_KEY(name) SETTINGS_KEY("FileLogger/") name
+#define FILELOGGER_SETTINGS_KEY(name) QStringLiteral(SETTINGS_KEY("FileLogger/") name)
     const QString KEY_FILELOGGER_ENABLED = FILELOGGER_SETTINGS_KEY("Enabled");
     const QString KEY_FILELOGGER_PATH = FILELOGGER_SETTINGS_KEY("Path");
     const QString KEY_FILELOGGER_BACKUP = FILELOGGER_SETTINGS_KEY("Backup");
     const QString KEY_FILELOGGER_DELETEOLD = FILELOGGER_SETTINGS_KEY("DeleteOld");
-    const QString KEY_FILELOGGER_MAXSIZE = FILELOGGER_SETTINGS_KEY("MaxSize");
+    const QString KEY_FILELOGGER_MAXSIZEBYTES = FILELOGGER_SETTINGS_KEY("MaxSizeBytes");
     const QString KEY_FILELOGGER_AGE = FILELOGGER_SETTINGS_KEY("Age");
     const QString KEY_FILELOGGER_AGETYPE = FILELOGGER_SETTINGS_KEY("AgeType");
 
-    //just a shortcut
+    // just a shortcut
     inline SettingsStorage *settings() { return  SettingsStorage::instance(); }
 
-    const QString LOG_FOLDER("logs");
-    const char PARAMS_SEPARATOR[] = "|";
+    const QString LOG_FOLDER = QStringLiteral("logs");
+    const QChar PARAMS_SEPARATOR = '|';
 
-    const QString DEFAULT_PORTABLE_MODE_PROFILE_DIR = QLatin1String("profile");
+    const QString DEFAULT_PORTABLE_MODE_PROFILE_DIR = QStringLiteral("profile");
+
+    const int MIN_FILELOG_SIZE = 1024; // 1KiB
+    const int MAX_FILELOG_SIZE = 1000 * 1024 * 1024; // 1000MiB
+    const int DEFAULT_FILELOG_SIZE = 65 * 1024; // 65KiB
 }
 
 Application::Application(const QString &id, int &argc, char **argv)
@@ -105,7 +114,9 @@ Application::Application(const QString &id, int &argc, char **argv)
     , m_running(false)
     , m_shutdownAct(ShutdownDialogAction::Exit)
     , m_commandLineArgs(parseCommandLine(this->arguments()))
+#ifndef DISABLE_WEBUI
     , m_webui(nullptr)
+#endif
 {
     qRegisterMetaType<Log::Msg>("Log::Msg");
 
@@ -126,7 +137,6 @@ Application::Application(const QString &id, int &argc, char **argv)
     if (m_commandLineArgs.webUiPort > 0) // it will be -1 when user did not set any value
         Preferences::instance()->setWebUiPort(m_commandLineArgs.webUiPort);
 
-    setApplicationName("qBittorrent");
     initializeTranslation();
 
 #if !defined(DISABLE_GUI)
@@ -135,11 +145,11 @@ Application::Application(const QString &id, int &argc, char **argv)
 #endif
 
 #if defined(Q_OS_WIN) && !defined(DISABLE_GUI)
-    connect(this, SIGNAL(commitDataRequest(QSessionManager &)), this, SLOT(shutdownCleanup(QSessionManager &)), Qt::DirectConnection);
+    connect(this, &QGuiApplication::commitDataRequest, this, &Application::shutdownCleanup, Qt::DirectConnection);
 #endif
 
-    connect(this, SIGNAL(messageReceived(const QString &)), SLOT(processMessage(const QString &)));
-    connect(this, SIGNAL(aboutToQuit()), SLOT(cleanup()));
+    connect(this, &Application::messageReceived, this, &Application::processMessage);
+    connect(this, &QCoreApplication::aboutToQuit, this, &Application::cleanup);
 
     if (isFileLoggerEnabled())
         m_fileLogger = new FileLogger(fileLoggerPath(), isFileLoggerBackup(), fileLoggerMaxSize(), isFileLoggerDeleteOld(), fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
@@ -219,29 +229,22 @@ void Application::setFileLoggerDeleteOld(bool value)
 
 int Application::fileLoggerMaxSize() const
 {
-    int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZE, 10).toInt();
-    if (val < 1)
-        return 1;
-    if (val > 1000)
-        return 1000;
-    return val;
+    int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE).toInt();
+    return std::min(std::max(val, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
 }
 
-void Application::setFileLoggerMaxSize(const int value)
+void Application::setFileLoggerMaxSize(const int bytes)
 {
+    int clampedValue = std::min(std::max(bytes, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
     if (m_fileLogger)
-        m_fileLogger->setMaxSize(value);
-    settings()->storeValue(KEY_FILELOGGER_MAXSIZE, std::min(std::max(value, 1), 1000));
+        m_fileLogger->setMaxSize(clampedValue);
+    settings()->storeValue(KEY_FILELOGGER_MAXSIZEBYTES, clampedValue);
 }
 
 int Application::fileLoggerAge() const
 {
-    int val = settings()->loadValue(KEY_FILELOGGER_AGE, 6).toInt();
-    if (val < 1)
-        return 1;
-    if (val > 365)
-        return 365;
-    return val;
+    int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1).toInt();
+    return std::min(std::max(val, 1), 365);
 }
 
 void Application::setFileLoggerAge(const int value)
@@ -252,17 +255,17 @@ void Application::setFileLoggerAge(const int value)
 int Application::fileLoggerAgeType() const
 {
     int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1).toInt();
-    return (val < 0 || val > 2) ? 1 : val;
+    return ((val < 0) || (val > 2)) ? 1 : val;
 }
 
 void Application::setFileLoggerAgeType(const int value)
 {
-    settings()->storeValue(KEY_FILELOGGER_AGETYPE, (value < 0 || value > 2) ? 1 : value);
+    settings()->storeValue(KEY_FILELOGGER_AGETYPE, ((value < 0) || (value > 2)) ? 1 : value);
 }
 
 void Application::processMessage(const QString &message)
 {
-    QStringList params = message.split(QLatin1String(PARAMS_SEPARATOR), QString::SkipEmptyParts);
+    QStringList params = message.split(PARAMS_SEPARATOR, QString::SkipEmptyParts);
     // If Application is not running (i.e., other
     // components are not ready) store params
     if (m_running)
@@ -271,59 +274,70 @@ void Application::processMessage(const QString &message)
         m_paramsQueue.append(params);
 }
 
-void Application::runExternalProgram(BitTorrent::TorrentHandle *const torrent) const
+void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) const
 {
-    QString program = Preferences::instance()->getAutoRunProgram();
+    QString program = Preferences::instance()->getAutoRunProgram().trimmed();
     program.replace("%N", torrent->name());
     program.replace("%L", torrent->category());
+
+    QStringList tags = torrent->tags().toList();
+    std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
+    program.replace("%G", tags.join(','));
+
+#if defined(Q_OS_WIN)
+    const auto chopPathSep = [](const QString &str) -> QString
+    {
+        if (str.endsWith('\\'))
+            return str.mid(0, (str.length() -1));
+        return str;
+    };
+    program.replace("%F", chopPathSep(Utils::Fs::toNativePath(torrent->contentPath())));
+    program.replace("%R", chopPathSep(Utils::Fs::toNativePath(torrent->rootPath())));
+    program.replace("%D", chopPathSep(Utils::Fs::toNativePath(torrent->savePath())));
+#else
     program.replace("%F", Utils::Fs::toNativePath(torrent->contentPath()));
     program.replace("%R", Utils::Fs::toNativePath(torrent->rootPath()));
     program.replace("%D", Utils::Fs::toNativePath(torrent->savePath()));
+#endif
     program.replace("%C", QString::number(torrent->filesCount()));
     program.replace("%Z", QString::number(torrent->totalSize()));
     program.replace("%T", torrent->currentTracker());
     program.replace("%I", torrent->hash());
 
     Logger *logger = Logger::instance();
-    logger->addMessage(tr("Torrent: %1, running external program, command: %2").arg(torrent->name()).arg(program));
+    logger->addMessage(tr("Torrent: %1, running external program, command: %2").arg(torrent->name(), program));
 
-#if defined(Q_OS_UNIX)
-    QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program});
-#elif defined(Q_OS_WIN)  // test cmd: `echo "%F" > "c:\ab ba.txt"`
-    program.prepend(QLatin1String("\"")).append(QLatin1String("\""));
-    program.prepend(Utils::Misc::windowsSystemPath() + QLatin1String("\\cmd.exe /C "));
-    const int cmdMaxLength = 32768;  // max length (incl. terminate char) for `lpCommandLine` in `CreateProcessW()`
-    if ((program.size() + 1) > cmdMaxLength) {
-        logger->addMessage(tr("Torrent: %1, run external program command too long (length > %2), execution failed.").arg(torrent->name()).arg(cmdMaxLength), Log::CRITICAL);
-        return;
-    }
+#if defined(Q_OS_WIN)
+    std::unique_ptr<wchar_t[]> programWchar(new wchar_t[program.length() + 1] {});
+    program.toWCharArray(programWchar.get());
 
-    STARTUPINFOW si = {0};
-    si.cb = sizeof(si);
-    PROCESS_INFORMATION pi = {0};
+    // Need to split arguments manually because QProcess::startDetached(QString)
+    // will strip off empty parameters.
+    // E.g. `python.exe "1" "" "3"` will become `python.exe "1" "3"`
+    int argCount = 0;
+    LPWSTR *args = ::CommandLineToArgvW(programWchar.get(), &argCount);
 
-    WCHAR *arg = new WCHAR[program.size() + 1];
-    program.toWCharArray(arg);
-    arg[program.size()] = L'\0';
-    if (CreateProcessW(NULL, arg, NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL, &si, &pi)) {
-        CloseHandle(pi.hProcess);
-        CloseHandle(pi.hThread);
-    }
-    delete[] arg;
+    QStringList argList;
+    for (int i = 1; i < argCount; ++i)
+        argList += QString::fromWCharArray(args[i]);
+
+    QProcess::startDetached(QString::fromWCharArray(args[0]), argList);
+
+    ::LocalFree(args);
 #else
-    QProcess::startDetached(program);
+    QProcess::startDetached(QLatin1String("/bin/sh"), {QLatin1String("-c"), program});
 #endif
 }
 
 void Application::sendNotificationEmail(const BitTorrent::TorrentHandle *torrent)
 {
     // Prepare mail content
-    const QString content = tr("Torrent name: %1").arg(torrent->name()) + "\n"
-        + tr("Torrent size: %1").arg(Utils::Misc::friendlyUnit(torrent->wantedSize())) + "\n"
+    const QString content = tr("Torrent name: %1").arg(torrent->name()) + '\n'
+        + tr("Torrent size: %1").arg(Utils::Misc::friendlyUnit(torrent->wantedSize())) + '\n'
         + tr("Save path: %1").arg(torrent->savePath()) + "\n\n"
         + tr("The torrent was downloaded in %1.", "The torrent was downloaded in 1 hour and 20 seconds")
             .arg(Utils::Misc::userFriendlyDuration(torrent->activeTime())) + "\n\n\n"
-        + tr("Thank you for using qBittorrent.") + "\n";
+        + tr("Thank you for using qBittorrent.") + '\n';
 
     // Send the notification email
     const Preferences *pref = Preferences::instance();
@@ -374,7 +388,7 @@ void Application::allTorrentsFinished()
         // do nothing & skip confirm
     }
     else {
-        if (!ShutdownConfirmDlg::askForConfirmation(m_window, action)) return;
+        if (!ShutdownConfirmDialog::askForConfirmation(m_window, action)) return;
     }
 #endif // DISABLE_GUI
 
@@ -395,7 +409,7 @@ void Application::allTorrentsFinished()
 
 bool Application::sendParams(const QStringList &params)
 {
-    return sendMessage(params.join(QLatin1String(PARAMS_SEPARATOR)));
+    return sendMessage(params.join(PARAMS_SEPARATOR));
 }
 
 // As program parameters, we can get paths or urls.
@@ -424,7 +438,7 @@ void Application::processParams(const QStringList &params)
         }
 
         if (param.startsWith(QLatin1String("@addPaused="))) {
-            torrentParams.addPaused = param.mid(11).toInt() ? TriStateBool::True : TriStateBool::False;
+            torrentParams.addPaused = param.midRef(11).toInt() ? TriStateBool::True : TriStateBool::False;
             continue;
         }
 
@@ -449,7 +463,7 @@ void Application::processParams(const QStringList &params)
         }
 
         if (param.startsWith(QLatin1String("@skipDialog="))) {
-            skipTorrentDialog = param.mid(12).toInt() ? TriStateBool::True : TriStateBool::False;
+            skipTorrentDialog = param.midRef(12).toInt() ? TriStateBool::True : TriStateBool::False;
             continue;
         }
 
@@ -481,8 +495,8 @@ int Application::exec(const QStringList &params)
 #endif
 
     BitTorrent::Session::initInstance();
-    connect(BitTorrent::Session::instance(), SIGNAL(torrentFinished(BitTorrent::TorrentHandle *const)), SLOT(torrentFinished(BitTorrent::TorrentHandle *const)));
-    connect(BitTorrent::Session::instance(), SIGNAL(allTorrentsFinished()), SLOT(allTorrentsFinished()), Qt::QueuedConnection);
+    connect(BitTorrent::Session::instance(), &BitTorrent::Session::torrentFinished, this, &Application::torrentFinished);
+    connect(BitTorrent::Session::instance(), &BitTorrent::Session::allTorrentsFinished, this, &Application::allTorrentsFinished, Qt::QueuedConnection);
 
 #ifndef DISABLE_COUNTRIES_RESOLUTION
     Net::GeoIPManager::initInstance();
@@ -503,15 +517,18 @@ int Application::exec(const QStringList &params)
 
 #ifdef DISABLE_GUI
 #ifndef DISABLE_WEBUI
-    Preferences* const pref = Preferences::instance();
+    Preferences *const pref = Preferences::instance();
     // Display some information to the user
-    std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl;
-    std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref->getWebUiPort()))) << std::endl;
-    std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(pref->getWebUiUsername())) << std::endl;
+    const QString mesg = QString("\n******** %1 ********\n").arg(tr("Information"))
+        + tr("To control qBittorrent, access the Web UI at %1")
+            .arg(QString("http://localhost:") + QString::number(pref->getWebUiPort())) + '\n'
+        + tr("The Web UI administrator user name is: %1").arg(pref->getWebUiUsername()) + '\n';
+    printf("%s", qUtf8Printable(mesg));
     qDebug() << "Password:" << pref->getWebUiPassword();
     if (pref->getWebUiPassword() == "f6fdffe48c908deb0f4c3bd36c032e72") {
-        std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl;
-        std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl;
+        const QString warning = tr("The Web UI administrator password is still the default one: %1").arg("adminadmin") + '\n'
+            + tr("This is a security risk, please consider changing your password from program preferences.") + '\n';
+        printf("%s", qUtf8Printable(warning));
     }
 #endif // DISABLE_WEBUI
 #else
@@ -596,7 +613,7 @@ bool Application::notify(QObject *receiver, QEvent *event)
 
 void Application::initializeTranslation()
 {
-    Preferences* const pref = Preferences::instance();
+    Preferences *const pref = Preferences::instance();
     // Load translation
     QString localeStr = pref->getLocale();
 
@@ -649,7 +666,7 @@ void Application::shutdownCleanup(QSessionManager &manager)
     // According to the qt docs we shouldn't call quit() inside a slot.
     // aboutToQuit() is never emitted if the user hits "Cancel" in
     // the above dialog.
-    QTimer::singleShot(0, qApp, SLOT(quit()));
+    QTimer::singleShot(0, qApp, &QCoreApplication::quit);
 }
 #endif
 
@@ -662,7 +679,7 @@ void Application::cleanup()
 
 #ifndef DISABLE_GUI
     if (m_window) {
-        // Hide the window and not leave it on screen as
+        // Hide the window and don't leave it on screen as
         // unresponsive. Also for Windows take the WinId
         // after it's hidden, because hide() may cause a
         // WinId change.
@@ -670,7 +687,7 @@ void Application::cleanup()
 
 #ifdef Q_OS_WIN
         typedef BOOL (WINAPI *PSHUTDOWNBRCREATE)(HWND, LPCWSTR);
-        PSHUTDOWNBRCREATE shutdownBRCreate = (PSHUTDOWNBRCREATE)::GetProcAddress(::GetModuleHandleW(L"User32.dll"), "ShutdownBlockReasonCreate");
+        const auto shutdownBRCreate = Utils::Misc::loadWinAPI<PSHUTDOWNBRCREATE>("User32.dll", "ShutdownBlockReasonCreate");
         // Only available on Vista+
         if (shutdownBRCreate)
             shutdownBRCreate((HWND)m_window->effectiveWinId(), tr("Saving torrent progress...").toStdWString().c_str());
@@ -712,7 +729,7 @@ void Application::cleanup()
     if (m_window) {
 #ifdef Q_OS_WIN
         typedef BOOL (WINAPI *PSHUTDOWNBRDESTROY)(HWND);
-        PSHUTDOWNBRDESTROY shutdownBRDestroy = (PSHUTDOWNBRDESTROY)::GetProcAddress(::GetModuleHandleW(L"User32.dll"), "ShutdownBlockReasonDestroy");
+        const auto shutdownBRDestroy = Utils::Misc::loadWinAPI<PSHUTDOWNBRDESTROY>("User32.dll", "ShutdownBlockReasonDestroy");
         // Only available on Vista+
         if (shutdownBRDestroy)
             shutdownBRDestroy((HWND)m_window->effectiveWinId());

src/app/application.h

@@ -40,15 +40,13 @@ typedef QtSingleApplication BaseApplication;
 class MainWindow;
 
 #ifdef Q_OS_WIN
-QT_BEGIN_NAMESPACE
 class QSessionManager;
-QT_END_NAMESPACE
 #endif // Q_OS_WIN
 
 #else
 #include "qtsinglecoreapplication.h"
 typedef QtSingleCoreApplication BaseApplication;
-#endif
+#endif // DISABLE_GUI
 
 #include "base/utils/misc.h"
 #include "cmdoptions.h"
@@ -101,7 +99,7 @@ public:
     bool isFileLoggerDeleteOld() const;
     void setFileLoggerDeleteOld(bool value);
     int fileLoggerMaxSize() const;
-    void setFileLoggerMaxSize(const int value);
+    void setFileLoggerMaxSize(const int bytes);
     int fileLoggerAge() const;
     void setFileLoggerAge(const int value);
     int fileLoggerAgeType() const;
@@ -110,9 +108,9 @@ public:
 protected:
 #ifndef DISABLE_GUI
 #ifdef Q_OS_MAC
-    bool event(QEvent *);
+    bool event(QEvent *) override;
 #endif
-    bool notify(QObject* receiver, QEvent* event);
+    bool notify(QObject *receiver, QEvent *event) override;
 #endif
 
 private slots:
@@ -146,7 +144,7 @@ private:
 
     void initializeTranslation();
     void processParams(const QStringList &params);
-    void runExternalProgram(BitTorrent::TorrentHandle *const torrent) const;
+    void runExternalProgram(const BitTorrent::TorrentHandle *torrent) const;
     void sendNotificationEmail(const BitTorrent::TorrentHandle *torrent);
     void validateCommandLineParameters();
 };

src/app/cmdoptions.cpp

@@ -2,7 +2,7 @@
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2016  Eugene Shalygin <eugene.shalygin@gmail.com>
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,13 +26,11 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "cmdoptions.h"
 
-#include <iostream>
+#include <cstdio>
 
 #include <QDebug>
 #include <QFileInfo>
@@ -100,7 +98,7 @@ namespace
     };
 
     // Boolean option.
-    class BoolOption: protected Option
+    class BoolOption : protected Option
     {
     public:
         constexpr BoolOption(const char *name, char shortcut = 0)
@@ -118,7 +116,7 @@ namespace
         {
             QString val = env.value(envVarName());
             // we accept "1" and "true" (upper or lower cased) as boolean 'true' values
-            return (val == QLatin1String("1") || val.toUpper() == QLatin1String("TRUE"));
+            return ((val == QLatin1String("1")) || (val.toUpper() == QLatin1String("TRUE")));
         }
 
         QString usage() const
@@ -137,7 +135,7 @@ namespace
     }
 
     // Option with string value. May not have a shortcut
-    struct StringOption: protected Option
+    struct StringOption : protected Option
     {
     public:
         constexpr StringOption(const char *name)
@@ -184,7 +182,7 @@ namespace
     }
 
     // Option with integer value. May not have a shortcut
-    class IntOption: protected StringOption
+    class IntOption : protected StringOption
     {
     public:
         constexpr IntOption(const char *name)
@@ -216,7 +214,7 @@ namespace
             int res = val.toInt(&ok);
             if (!ok) {
                 qDebug() << QObject::tr("Expected integer number in environment variable '%1', but got '%2'")
-                    .arg(envVarName()).arg(val);
+                    .arg(envVarName(), val);
                 return defaultValue;
             }
             return res;
@@ -230,7 +228,7 @@ namespace
 
     // Option that is explicitly set to true or false, and whose value is undefined when unspecified.
     // May not have a shortcut.
-    class TriStateBoolOption: protected Option
+    class TriStateBoolOption : protected Option
     {
     public:
         constexpr TriStateBoolOption(const char *name, bool defaultValue)
@@ -260,10 +258,10 @@ namespace
             else if (parts.size() == 2) {
                 QString val = parts[1];
 
-                if (val.toUpper() == QLatin1String("TRUE") || val == QLatin1String("1")) {
+                if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1"))) {
                     return TriStateBool::True;
                 }
-                else if (val.toUpper() == QLatin1String("FALSE") || val == QLatin1String("0")) {
+                else if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
                     return TriStateBool::False;
                 }
             }
@@ -285,15 +283,15 @@ namespace
             else if (val == QLatin1String("-1")) {
                 return TriStateBool::Undefined;
             }
-            else if (val.toUpper() == QLatin1String("TRUE") || val == QLatin1String("1")) {
+            else if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1"))) {
                 return TriStateBool::True;
             }
-            else if (val.toUpper() == QLatin1String("FALSE") || val == QLatin1String("0")) {
+            else if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0"))) {
                 return TriStateBool::False;
             }
             else {
                 qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
-                    .arg(QLatin1String("true|false")).arg(envVarName()).arg(val);
+                    .arg(QLatin1String("true|false"), envVarName(), val);
                 return TriStateBool::Undefined;
             }
         }
@@ -360,7 +358,7 @@ QStringList QBtCommandLineParameters::paramList() const
     // the user has specified. Here we place special strings that are
     // almost certainly not going to collide with a file path or URL
     // specified by the user, and placing them at the beginning of the
-    // string listr so that they will be processed before the list of
+    // string list so that they will be processed before the list of
     // torrent paths or URLs.
 
     if (!savePath.isEmpty())
@@ -404,9 +402,9 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
         const QString &arg = args[i];
 
         if ((arg.startsWith("--") && !arg.endsWith(".torrent"))
-            || (arg.startsWith("-") && (arg.size() == 2))) {
+            || (arg.startsWith('-') && (arg.size() == 2))) {
             // Parse known parameters
-            if ((arg == SHOW_HELP_OPTION)) {
+            if (arg == SHOW_HELP_OPTION) {
                 result.showHelp = true;
             }
 #ifndef Q_OS_WIN
@@ -501,7 +499,7 @@ QString wrapText(const QString &text, int initialIndentation = USAGE_TEXT_COLUMN
 
     foreach (const QString &word, words.mid(1)) {
         if (lines.last().length() + word.length() + 1 < currentLineMaxLength) {
-            lines.last().append(" " + word);
+            lines.last().append(' ' + word);
         }
         else {
             lines.append(QString(initialIndentation, ' ') + word);
@@ -509,7 +507,7 @@ QString wrapText(const QString &text, int initialIndentation = USAGE_TEXT_COLUMN
         }
     }
 
-    return lines.join("\n");
+    return lines.join('\n');
 }
 
 QString makeUsage(const QString &prgName)
@@ -578,7 +576,7 @@ QString makeUsage(const QString &prgName)
 void displayUsage(const QString &prgName)
 {
 #ifndef Q_OS_WIN
-    std::cout << qPrintable(makeUsage(prgName)) << std::endl;
+    printf("%s\n", qUtf8Printable(makeUsage(prgName)));
 #else
     QMessageBox msgBox(QMessageBox::Information, QObject::tr("Help"), makeUsage(prgName), QMessageBox::Ok);
     msgBox.show(); // Need to be shown or to moveToCenter does not work

src/app/cmdoptions.h

@@ -2,7 +2,7 @@
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2016  Eugene Shalygin <eugene.shalygin@gmail.com>
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,8 +26,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef APP_OPTIONS_H
@@ -62,11 +60,11 @@ struct QBtCommandLineParameters
     QStringList paramList() const;
 };
 
-class CommandLineParameterError: public std::runtime_error
+class CommandLineParameterError : public std::runtime_error
 {
 public:
     CommandLineParameterError(const QString &messageForUser);
-    const QString& messageForUser() const;
+    const QString &messageForUser() const;
 
 private:
     const QString m_messageForUser;

src/app/filelogger.cpp

@@ -26,11 +26,13 @@
  * exception statement from your version.
  */
 
+#include "filelogger.h"
+
 #include <QDateTime>
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
-#include "filelogger.h"
+
 #include "base/logger.h"
 #include "base/utils/fs.h"
 
@@ -41,17 +43,17 @@ FileLogger::FileLogger(const QString &path, const bool backup, const int maxSize
 {
     m_flusher.setInterval(0);
     m_flusher.setSingleShot(true);
-    connect(&m_flusher, SIGNAL(timeout()), SLOT(flushLog()));
+    connect(&m_flusher, &QTimer::timeout, this, &FileLogger::flushLog);
 
     changePath(path);
     if (deleteOld)
         this->deleteOld(age, ageType);
 
-    const Logger* const logger = Logger::instance();
-    foreach (const Log::Msg& msg, logger->getMessages())
+    const Logger *const logger = Logger::instance();
+    foreach (const Log::Msg &msg, logger->getMessages())
         addLogMessage(msg);
 
-    connect(logger, SIGNAL(newLogMessage(const Log::Msg &)), SLOT(addLogMessage(const Log::Msg &)));
+    connect(logger, &Logger::newLogMessage, this, &FileLogger::addLogMessage);
 }
 
 FileLogger::~FileLogger()
@@ -61,7 +63,7 @@ FileLogger::~FileLogger()
     delete m_logFile;
 }
 
-void FileLogger::changePath(const QString& newPath)
+void FileLogger::changePath(const QString &newPath)
 {
     QString tmpPath = Utils::Fs::fromNativePath(newPath);
     QDir dir(tmpPath);
@@ -83,21 +85,21 @@ void FileLogger::changePath(const QString& newPath)
 void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
 {
     QDateTime date = QDateTime::currentDateTime();
-    QDir dir(m_path);
-
-    switch (ageType) {
-    case DAYS:
-        date = date.addDays(age);
-        break;
-    case MONTHS:
-        date = date.addMonths(age);
-        break;
-    default:
-        date = date.addYears(age);
-    }
+    QDir dir(Utils::Fs::branchPath(m_path));
 
     foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) {
-        if (file.lastModified() < date)
+        QDateTime modificationDate = file.lastModified();
+        switch (ageType) {
+        case DAYS:
+            modificationDate = modificationDate.addDays(age);
+            break;
+        case MONTHS:
+            modificationDate = modificationDate.addMonths(age);
+            break;
+        default:
+            modificationDate = modificationDate.addYears(age);
+        }
+        if (modificationDate > date)
             break;
         Utils::Fs::forceRemove(file.absoluteFilePath());
     }
@@ -135,7 +137,7 @@ void FileLogger::addLogMessage(const Log::Msg &msg)
 
     str << QDateTime::fromMSecsSinceEpoch(msg.timestamp).toString(Qt::ISODate) << " - " << msg.message << endl;
 
-    if (m_backup && (m_logFile->size() >= (m_maxSize * 1024 * 1024))) {
+    if (m_backup && (m_logFile->size() >= m_maxSize)) {
         closeLogFile();
         int counter = 0;
         QString backupLogFilename = m_path + ".bak";
@@ -165,7 +167,7 @@ void FileLogger::openLogFile()
         || !m_logFile->setPermissions(QFile::ReadOwner | QFile::WriteOwner)) {
         delete m_logFile;
         m_logFile = nullptr;
-        Logger::instance()->addMessage(tr("An error occured while trying to open the log file. Logging to file is disabled."), Log::CRITICAL);
+        Logger::instance()->addMessage(tr("An error occurred while trying to open the log file. Logging to file is disabled."), Log::CRITICAL);
     }
 }
 

src/app/filelogger.h

@@ -76,4 +76,3 @@ private:
 };
 
 #endif // FILELOGGER_H
-

src/app/main.cpp

@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Christophe Dumez
+ * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,10 +25,10 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
+#include <cstdlib>
+
 #include <QDebug>
 #include <QScopedPointer>
 #include <QThread>
@@ -55,33 +55,28 @@ Q_IMPORT_PLUGIN(QICOPlugin)
 #endif
 #endif // DISABLE_GUI
 
+#include <signal.h>
+#ifdef STACKTRACE
 #ifdef Q_OS_UNIX
-#include <signal.h>
-#include <execinfo.h>
 #include "stacktrace.h"
-#endif // Q_OS_UNIX
-
-#ifdef STACKTRACE_WIN
-#include <signal.h>
+#else
 #include "stacktrace_win.h"
-#include "stacktrace_win_dlg.h"
-#endif //STACKTRACE_WIN
+#include "stacktracedialog.h"
+#endif // Q_OS_UNIX
+#endif //STACKTRACE
 
-#include <cstdlib>
-#include <iostream>
-
-#include "application.h"
+#include "base/preferences.h"
 #include "base/profile.h"
 #include "base/utils/misc.h"
-#include "base/preferences.h"
+#include "application.h"
 #include "cmdoptions.h"
-
 #include "upgrade.h"
 
 // Signal handlers
-#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
 void sigNormalHandler(int signum);
+#ifdef STACKTRACE
 void sigAbnormalHandler(int signum);
+#endif
 // sys_signame[] is only defined in BSD
 const char *sysSigName[] = {
 #if defined(Q_OS_WIN)
@@ -96,10 +91,9 @@ const char *sysSigName[] = {
     "SIGPWR", "SIGUNUSED"
 #endif
 };
-#endif
 
 #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
-void reportToUser(const char* str);
+void reportToUser(const char *str);
 #endif
 
 void displayVersion();
@@ -169,7 +163,7 @@ int main(int argc, char *argv[])
 
         // Set environment variable
         if (!qputenv("QBITTORRENT", QBT_VERSION))
-            std::cerr << "Couldn't set environment variable...\n";
+            fprintf(stderr, "Couldn't set environment variable...\n");
 
 #ifndef DISABLE_GUI
         if (!userAgreesWithLegalNotice())
@@ -212,6 +206,10 @@ int main(int argc, char *argv[])
         // 3. https://bugreports.qt.io/browse/QTBUG-46015
 
         qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
+        // this is the default in Qt6
+        app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
+#endif
 #endif
 
 #if defined(Q_OS_MAC)
@@ -236,7 +234,7 @@ int main(int argc, char *argv[])
 #ifdef DISABLE_GUI
         if (params.shouldDaemonize) {
             app.reset(); // Destroy current application
-            if ((daemon(1, 0) == 0)) {
+            if (daemon(1, 0) == 0) {
                 app.reset(new Application(appId, argc, argv));
                 if (app->isRunning()) {
                     // Another instance had time to start.
@@ -253,9 +251,9 @@ int main(int argc, char *argv[])
             showSplashScreen();
 #endif
 
-#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
         signal(SIGINT, sigNormalHandler);
         signal(SIGTERM, sigNormalHandler);
+#ifdef STACKTRACE
         signal(SIGABRT, sigAbnormalHandler);
         signal(SIGSEGV, sigAbnormalHandler);
 #endif
@@ -269,7 +267,7 @@ int main(int argc, char *argv[])
 }
 
 #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
-void reportToUser(const char* str)
+void reportToUser(const char *str)
 {
     const size_t strLen = strlen(str);
     if (write(STDERR_FILENO, str, strLen) < static_cast<ssize_t>(strLen)) {
@@ -279,7 +277,6 @@ void reportToUser(const char* str)
 }
 #endif
 
-#if defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
 void sigNormalHandler(int signum)
 {
 #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
@@ -293,6 +290,7 @@ void sigNormalHandler(int signum)
     qApp->exit();  // unsafe, but exit anyway
 }
 
+#ifdef STACKTRACE
 void sigAbnormalHandler(int signum)
 {
     const char *sigName = sysSigName[signum];
@@ -305,36 +303,38 @@ void sigAbnormalHandler(int signum)
     reportToUser(sigName);
     reportToUser("\n");
     print_stacktrace();  // unsafe
-#endif // !defined Q_OS_WIN && !defined Q_OS_HAIKU
-#ifdef STACKTRACE_WIN
-    StraceDlg dlg;  // unsafe
+#endif
+
+#if defined Q_OS_WIN
+    StacktraceDialog dlg;  // unsafe
     dlg.setStacktraceString(QLatin1String(sigName), straceWin::getBacktrace());
     dlg.exec();
-#endif // STACKTRACE_WIN
+#endif
+
     signal(signum, SIG_DFL);
     raise(signum);
 }
-#endif // defined(Q_OS_UNIX) || defined(STACKTRACE_WIN)
+#endif // STACKTRACE
 
 #if !defined(DISABLE_GUI)
 void showSplashScreen()
 {
-    QPixmap splash_img(":/icons/skin/splash.png");
-    QPainter painter(&splash_img);
+    QPixmap splashImg(":/icons/skin/splash.png");
+    QPainter painter(&splashImg);
     QString version = QBT_VERSION;
     painter.setPen(QPen(Qt::white));
     painter.setFont(QFont("Arial", 22, QFont::Black));
     painter.drawText(224 - painter.fontMetrics().width(version), 270, version);
-    QSplashScreen *splash = new QSplashScreen(splash_img);
+    QSplashScreen *splash = new QSplashScreen(splashImg);
     splash->show();
-    QTimer::singleShot(1500, splash, SLOT(deleteLater()));
+    QTimer::singleShot(1500, splash, &QObject::deleteLater);
     qApp->processEvents();
 }
 
 #if defined(Q_OS_UNIX)
 void setupDpi()
 {
-    if (qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR").isEmpty())
+    if (qEnvironmentVariableIsEmpty("QT_AUTO_SCREEN_SCALE_FACTOR"))
         qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1");
 }
 #endif  // Q_OS_UNIX
@@ -342,10 +342,10 @@ void setupDpi()
 
 void displayVersion()
 {
-    std::cout << qPrintable(qApp->applicationName()) << " " << QBT_VERSION << std::endl;
+    printf("%s %s\n", qUtf8Printable(qApp->applicationName()), QBT_VERSION);
 }
 
-void displayBadArgMessage(const QString& message)
+void displayBadArgMessage(const QString &message)
 {
     QString help = QObject::tr("Run application with -h option to read about command line parameters.");
 #ifdef Q_OS_WIN
@@ -355,24 +355,28 @@ void displayBadArgMessage(const QString& message)
     msgBox.move(Utils::Misc::screenCenter(&msgBox));
     msgBox.exec();
 #else
-    std::cerr << qPrintable(QObject::tr("Bad command line: "));
-    std::cerr << qPrintable(message) << std::endl;
-    std::cerr << qPrintable(help) << std::endl;
+    const QString errMsg = QObject::tr("Bad command line: ") + '\n'
+        + message + '\n'
+        + help + '\n';
+    fprintf(stderr, "%s", qUtf8Printable(errMsg));
 #endif
 }
 
 bool userAgreesWithLegalNotice()
 {
-    Preferences* const pref = Preferences::instance();
+    Preferences *const pref = Preferences::instance();
     if (pref->getAcceptedLegal()) // Already accepted once
         return true;
 
 #ifdef DISABLE_GUI
-    std::cout << std::endl << "*** " << qPrintable(QObject::tr("Legal Notice")) << " ***" << std::endl;
-    std::cout << qPrintable(QObject::tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.\n\nNo further notices will be issued.")) << std::endl << std::endl;
-    std::cout << qPrintable(QObject::tr("Press %1 key to accept and continue...").arg("'y'")) << std::endl;
+    const QString eula = QString("\n*** %1 ***\n").arg(QObject::tr("Legal Notice"))
+        + QObject::tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.") + "\n\n"
+        + QObject::tr("No further notices will be issued.") + "\n\n"
+        + QObject::tr("Press %1 key to accept and continue...").arg("'y'") + '\n';
+    printf("%s", qUtf8Printable(eula));
+
     char ret = getchar(); // Read pressed key
-    if (ret == 'y' || ret == 'Y') {
+    if ((ret == 'y') || (ret == 'Y')) {
         // Save the answer
         pref->setAcceptedLegal(true);
         return true;
@@ -382,16 +386,16 @@ bool userAgreesWithLegalNotice()
     msgBox.setText(QObject::tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.\n\nNo further notices will be issued."));
     msgBox.setWindowTitle(QObject::tr("Legal notice"));
     msgBox.addButton(QObject::tr("Cancel"), QMessageBox::RejectRole);
-    QAbstractButton *agree_button = msgBox.addButton(QObject::tr("I Agree"), QMessageBox::AcceptRole);
+    QAbstractButton *agreeButton = msgBox.addButton(QObject::tr("I Agree"), QMessageBox::AcceptRole);
     msgBox.show(); // Need to be shown or to moveToCenter does not work
     msgBox.move(Utils::Misc::screenCenter(&msgBox));
     msgBox.exec();
-    if (msgBox.clickedButton() == agree_button) {
+    if (msgBox.clickedButton() == agreeButton) {
         // Save the answer
         pref->setAcceptedLegal(true);
         return true;
     }
-#endif
+#endif // DISABLE_GUI
 
     return false;
 }

src/app/qtsingleapplication/CMakeLists.txt

@@ -8,24 +8,24 @@ set(QBT_QTSINGLEAPPLICATION_SOURCES
 qtlocalpeer.cpp
 )
 
-if (GUI)
+if (Qt5Widgets_FOUND)
     list(APPEND QBT_QTSINGLEAPPLICATION_HEADERS qtsingleapplication.h)
     list(APPEND QBT_QTSINGLEAPPLICATION_SOURCES qtsingleapplication.cpp)
-else (GUI)
+else (Qt5Widgets_FOUND)
     list(APPEND QBT_QTSINGLEAPPLICATION_HEADERS qtsinglecoreapplication.h)
     list(APPEND QBT_QTSINGLEAPPLICATION_SOURCES qtsinglecoreapplication.cpp)
-endif (GUI)
+endif (Qt5Widgets_FOUND)
 
 add_library(qtsingleapplication STATIC ${QBT_QTSINGLEAPPLICATION_HEADERS} ${QBT_QTSINGLEAPPLICATION_SOURCES})
 target_include_directories(qtsingleapplication INTERFACE "${qtsingleapplication_SOURCE_DIR}")
-target_link_qt_components(qtsingleapplication Network)
+target_link_libraries(qtsingleapplication PRIVATE Qt5::Network)
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
     target_compile_options(qtsingleapplication PRIVATE "-w") # disable warning for 3rdparty code
 endif()
 
-if (GUI)
-    target_link_qt_components(qtsingleapplication Widgets)
-endif (GUI)
+if (Qt5Widgets_FOUND)
+    target_link_libraries(qtsingleapplication PRIVATE Qt5::Widgets)
+endif (Qt5Widgets_FOUND)
 
 add_library(QtSingleApplication::QtSingleApplication ALIAS qtsingleapplication)

src/app/stacktrace_win.h

@@ -138,7 +138,7 @@ bool straceWin::makeRelativePath(const QString& dir, QString& file)
 
 QString straceWin::getSourcePathAndLineNumber(HANDLE hProcess, DWORD64 addr)
 {
-    IMAGEHLP_LINE64 line = {0};
+    IMAGEHLP_LINE64 line {};
     line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
     DWORD dwDisplacement = 0;
 
@@ -291,7 +291,7 @@ const QString straceWin::getBacktrace()
                 demangle(funcName);
 #endif
 
-                // now ihsf.InstructionOffset points to the instruction that follows CALL instuction
+                // now ihsf.InstructionOffset points to the instruction that follows CALL instruction
                 // decrease the query address by one byte to point somewhere in the CALL instruction byte sequence
                 sourceFile = getSourcePathAndLineNumber(hProcess, ihsf.InstructionOffset - 1);
             }

src/app/stacktracedialog.h

@@ -27,20 +27,21 @@
  *
  */
 
-#ifndef STACKTRACE_WIN_DLG_H
-#define STACKTRACE_WIN_DLG_H
+#ifndef STACKTRACEDIALOG_H
+#define STACKTRACEDIALOG_H
 
 #include <QString>
 #include <QDialog>
-#include "base/utils/misc.h"
-#include "ui_stacktrace_win_dlg.h"
 
-class StraceDlg : public QDialog, private Ui::errorDialog
+#include "base/utils/misc.h"
+#include "ui_stacktracedialog.h"
+
+class StacktraceDialog : public QDialog, private Ui::StacktraceDialog
 {
     Q_OBJECT
 
 public:
-    StraceDlg(QWidget *parent = nullptr)
+    StacktraceDialog(QWidget *parent = nullptr)
         : QDialog(parent)
     {
         setupUi(this);
@@ -83,4 +84,4 @@ public:
     }
 };
 
-#endif
+#endif // STACKTRACEDIALOG_H

src/app/stacktracedialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>errorDialog</class>
- <widget class="QDialog" name="errorDialog">
+ <class>StacktraceDialog</class>
+ <widget class="QDialog" name="StacktraceDialog">
   <property name="geometry">
    <rect>
     <x>0</x>

src/app/upgrade.h

@@ -29,42 +29,43 @@
 #ifndef UPGRADE_H
 #define UPGRADE_H
 
-#include <libtorrent/version.hpp>
-#if LIBTORRENT_VERSION_NUM >= 10100
-#include <libtorrent/bdecode.hpp>
-#endif
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/entry.hpp>
-#if LIBTORRENT_VERSION_NUM < 10100
+#include <libtorrent/version.hpp>
+
+#if LIBTORRENT_VERSION_NUM >= 10100
+#include <libtorrent/bdecode.hpp>
+#else
 #include <libtorrent/lazy_entry.hpp>
 #endif
 
-
 #include <QDir>
 #include <QFile>
+#include <QRegularExpression>
+#include <QString>
+
 #ifndef DISABLE_GUI
 #include <QMessageBox>
 #endif
-#include <QRegExp>
-#include <QString>
 #ifdef Q_OS_MAC
 #include <QSettings>
 #endif
 
 #include "base/logger.h"
+#include "base/preferences.h"
 #include "base/profile.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
-#include "base/preferences.h"
 
 bool userAcceptsUpgrade()
 {
 #ifdef DISABLE_GUI
-    std::cout << std::endl << "*** " << qPrintable(QObject::tr("Upgrade")) << " ***" << std::endl;
+    printf("\n*** %s ***\n", qUtf8Printable(QObject::tr("Upgrade")));
     char ret = '\0';
     do {
-        std::cout << qPrintable(QObject::tr("You updated from an older version that saved things differently. You must migrate to the new saving system. You will not be able to use an older version than v3.3.0 again. Continue? [y/n]")) << std::endl;
+        printf("%s\n"
+            , qUtf8Printable(QObject::tr("You updated from an older version that saved things differently. You must migrate to the new saving system. You will not be able to use an older version than v3.3.0 again. Continue? [y/n]")));
         ret = getchar(); // Read pressed key
     }
     while ((ret != 'y') && (ret != 'Y') && (ret != 'n') && (ret != 'N'));
@@ -113,12 +114,28 @@ bool upgradeResumeFile(const QString &filepath, const QVariantHash &oldTorrent =
     bool v3_3 = false;
     int queuePosition = 0;
     QString outFilePath = filepath;
-    QRegExp rx(QLatin1String("([A-Fa-f0-9]{40})\\.fastresume\\.(\\d+)$"));
-    if (rx.indexIn(filepath) != -1) {
-        // old v3.3.x format
-        queuePosition = rx.cap(2).toInt();
+    static const QRegularExpression rx(QLatin1String("([A-Fa-f0-9]{40})\\.fastresume\\.(.+)$"));
+    const QRegularExpressionMatch rxMatch = rx.match(filepath);
+    if (rxMatch.hasMatch()) {
+        // Old v3.3.x format had a number at the end indicating the queue position.
+        // The naming scheme was '<infohash>.fastresume.<queueposition>'.
+        // However, QSaveFile, which uses QTemporaryFile internally, might leave
+        // non-commited files behind eg after a crash. These files have the
+        // naming scheme '<infohash>.fastresume.XXXXXX' where each X is a random
+        // character. So we detect if the last part is present. Then check if it
+        // is 6 chars long. If all the 6 chars are digits we assume it is an old
+        // v3.3.x format. Otherwise it is considered a non-commited fastresume
+        // and is deleted, because it may be a corrupted/incomplete fastresume.
+        // NOTE: When the upgrade code is removed, we must continue to perform
+        // cleanup of non-commited QSaveFile/QTemporaryFile fastresumes
+        queuePosition = rxMatch.captured(2).toInt();
+        if ((rxMatch.captured(2).size() == 6) && (queuePosition <= 99999)) {
+            Utils::Fs::forceRemove(filepath);
+            return true;
+        }
+
         v3_3 = true;
-        outFilePath.replace(QRegExp("\\.\\d+$"), "");
+        outFilePath.replace(QRegularExpression("\\.fastresume\\..+$"), ".fastresume");
     }
     else {
         queuePosition = fastOld.dict_find_int_value("qBt-queuePosition", 0);
@@ -129,6 +146,15 @@ bool upgradeResumeFile(const QString &filepath, const QVariantHash &oldTorrent =
     // in versions < 3.3 we have -1 for seeding torrents, so we convert it to 0
     fastNew["qBt-queuePosition"] = (queuePosition >= 0 ? queuePosition : 0);
 
+    if (v3_3) {
+        QFileInfo oldFile(filepath);
+        QFileInfo newFile(outFilePath);
+        if (newFile.exists()
+            && (oldFile.lastModified() < newFile.lastModified())) {
+            Utils::Fs::forceRemove(filepath);
+            return true;
+        }
+    }
     QFile file2(outFilePath);
     QVector<char> out;
     libtorrent::bencode(std::back_inserter(out), fastNew);
@@ -173,22 +199,25 @@ bool upgrade(bool ask = true)
 
     QStringList backupFiles = backupFolderDir.entryList(
                 QStringList(QLatin1String("*.fastresume")), QDir::Files, QDir::Unsorted);
-    QRegExp rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$"));
+    const QRegularExpression rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$"));
     foreach (QString backupFile, backupFiles) {
-        if (rx.indexIn(backupFile) != -1) {
-            if (upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile), oldResumeData[rx.cap(1)].toHash()))
-                oldResumeData.remove(rx.cap(1));
+        const QRegularExpressionMatch rxMatch = rx.match(backupFile);
+        if (rxMatch.hasMatch()) {
+            const QString hashStr = rxMatch.captured(1);
+            if (upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile), oldResumeData[hashStr].toHash()))
+                oldResumeData.remove(hashStr);
             else
-                Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent with hash: %1").arg(rx.cap(1)), Log::WARNING);
+                Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent with hash: %1").arg(hashStr), Log::WARNING);
         }
         else {
             Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent. Invalid fastresume file name: %1").arg(backupFile), Log::WARNING);
         }
     }
 
-    foreach (const QString &hash, oldResumeData.keys()) {
-        QVariantHash oldTorrent = oldResumeData[hash].toHash();
+    for (auto i = oldResumeData.cbegin(); i != oldResumeData.cend(); ++i) {
+        const QVariantHash oldTorrent = i.value().toHash();
         if (oldTorrent.value("is_magnet", false).toBool()) {
+            const QString &hash = i.key();
             libtorrent::entry resumeData;
             resumeData["qBt-magnetUri"] = oldTorrent.value("magnet_uri").toString().toStdString();
             resumeData["qBt-paused"] = false;
@@ -270,6 +299,6 @@ void migrateRSS()
         qBTRSSLegacy->remove("old_items");
     }
 }
-#endif
+#endif // DISABLE_GUI
 
 #endif // UPGRADE_H

src/base/CMakeLists.txt

@@ -1,6 +1,7 @@
 find_package(ZLIB 1.2.5.2 REQUIRED)
 
-set(QBT_BASE_HEADERS
+add_library(qbt_base STATIC
+# headers
 bittorrent/addtorrentparams.h
 bittorrent/cachestatus.h
 bittorrent/infohash.h
@@ -19,6 +20,7 @@ bittorrent/torrentinfo.h
 bittorrent/tracker.h
 bittorrent/trackerentry.h
 http/connection.h
+http/httperror.h
 http/irequesthandler.h
 http/requestparser.h
 http/responsebuilder.h
@@ -43,6 +45,11 @@ rss/rss_feed.h
 rss/rss_folder.h
 rss/rss_item.h
 rss/rss_session.h
+search/searchdownloadhandler.h
+search/searchhandler.h
+search/searchpluginmanager.h
+utils/bytearray.h
+utils/foreignapps.h
 utils/fs.h
 utils/gzip.h
 utils/misc.h
@@ -50,7 +57,9 @@ utils/net.h
 utils/random.h
 utils/string.h
 utils/version.h
+algorithm.h
 asyncfilestorage.h
+exceptions.h
 filesystemwatcher.h
 global.h
 iconprovider.h
@@ -59,16 +68,14 @@ logger.h
 preferences.h
 profile.h
 scanfoldersmodel.h
-searchengine.h
 settingsstorage.h
 torrentfileguard.h
 torrentfilter.h
 tristatebool.h
 types.h
 unicodestrings.h
-)
 
-set(QBT_BASE_SOURCES
+# sources
 bittorrent/infohash.cpp
 bittorrent/magneturi.cpp
 bittorrent/peerinfo.cpp
@@ -84,6 +91,7 @@ bittorrent/torrentinfo.cpp
 bittorrent/tracker.cpp
 bittorrent/trackerentry.cpp
 http/connection.cpp
+http/httperror.cpp
 http/requestparser.cpp
 http/responsebuilder.cpp
 http/responsegenerator.cpp
@@ -106,6 +114,11 @@ rss/rss_feed.cpp
 rss/rss_folder.cpp
 rss/rss_item.cpp
 rss/rss_session.cpp
+search/searchdownloadhandler.cpp
+search/searchhandler.cpp
+search/searchpluginmanager.cpp
+utils/bytearray.cpp
+utils/foreignapps.cpp
 utils/fs.cpp
 utils/gzip.cpp
 utils/misc.cpp
@@ -113,29 +126,33 @@ utils/net.cpp
 utils/random.cpp
 utils/string.cpp
 asyncfilestorage.cpp
+exceptions.cpp
 filesystemwatcher.cpp
 iconprovider.cpp
 logger.cpp
 preferences.cpp
 profile.cpp
 scanfoldersmodel.cpp
-searchengine.cpp
 settingsstorage.cpp
 torrentfileguard.cpp
 torrentfilter.cpp
 tristatebool.cpp
 )
 
-add_library(qbt_base STATIC ${QBT_BASE_HEADERS} ${QBT_BASE_SOURCES})
-target_link_libraries(qbt_base PRIVATE ZLIB::ZLIB PUBLIC LibtorrentRasterbar::LibTorrent)
-target_link_qt_components(qbt_base PUBLIC Core Network Xml)
+target_link_libraries(qbt_base
+    PRIVATE
+        ZLIB::ZLIB
+    PUBLIC
+        LibtorrentRasterbar::torrent-rasterbar
+        Qt5::Core Qt5::Network Qt5::Xml
+)
 
-if (GUI)
+if (Qt5Widgets_FOUND)
     target_link_libraries(qbt_base PUBLIC Qt5::Gui Qt5::Widgets)
-endif (GUI)
+endif (Qt5Widgets_FOUND)
 
-if (DBUS)
-    target_link_qt_components(qbt_base PRIVATE DBus)
+if (Qt5DBus_FOUND)
+    target_link_libraries(qbt_base PRIVATE Qt5::DBus)
 endif ()
 
 if (APPLE)

src/base/algorithm.h

@@ -0,0 +1,41 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#pragma once
+
+namespace Dict
+{
+    // To be used with QMap, QHash and it's variants
+    template <typename Dictionary, typename BinaryPredicate>
+    void removeIf(Dictionary &&dict, BinaryPredicate p)
+    {
+        auto it = dict.begin();
+        while (it != dict.end())
+            it = (p(it.key(), it.value()) ? dict.erase(it) : it + 1);
+    }
+}

src/base/asyncfilestorage.h

@@ -34,14 +34,14 @@
 #include <QFile>
 #include <QObject>
 
-class AsyncFileStorageError: public std::runtime_error
+class AsyncFileStorageError : public std::runtime_error
 {
 public:
     explicit AsyncFileStorageError(const QString &message);
     QString message() const;
 };
 
-class AsyncFileStorage: public QObject
+class AsyncFileStorage : public QObject
 {
     Q_OBJECT
 

src/base/base.pri

@@ -1,124 +1,137 @@
 HEADERS += \
+    $$PWD/algorithm.h \
     $$PWD/asyncfilestorage.h \
-    $$PWD/types.h \
-    $$PWD/tristatebool.h \
+    $$PWD/bittorrent/addtorrentparams.h  \
+    $$PWD/bittorrent/cachestatus.h \
+    $$PWD/bittorrent/infohash.h \
+    $$PWD/bittorrent/magneturi.h \
+    $$PWD/bittorrent/peerinfo.h \
+    $$PWD/bittorrent/private/bandwidthscheduler.h \
+    $$PWD/bittorrent/private/filterparserthread.h \
+    $$PWD/bittorrent/private/resumedatasavingmanager.h \
+    $$PWD/bittorrent/private/speedmonitor.h \
+    $$PWD/bittorrent/private/statistics.h \
+    $$PWD/bittorrent/session.h \
+    $$PWD/bittorrent/sessionstatus.h \
+    $$PWD/bittorrent/torrentcreatorthread.h \
+    $$PWD/bittorrent/torrenthandle.h \
+    $$PWD/bittorrent/torrentinfo.h \
+    $$PWD/bittorrent/tracker.h \
+    $$PWD/bittorrent/trackerentry.h \
+    $$PWD/exceptions.h \
     $$PWD/filesystemwatcher.h \
-    $$PWD/logger.h \
-    $$PWD/settingsstorage.h \
-    $$PWD/settingvalue.h \
-    $$PWD/preferences.h \
-    $$PWD/indexrange.h \
-    $$PWD/iconprovider.h \
-    $$PWD/http/irequesthandler.h \
+    $$PWD/global.h \
     $$PWD/http/connection.h \
+    $$PWD/http/httperror.h \
+    $$PWD/http/irequesthandler.h \
     $$PWD/http/requestparser.h \
+    $$PWD/http/responsebuilder.h \
     $$PWD/http/responsegenerator.h \
     $$PWD/http/server.h \
     $$PWD/http/types.h \
-    $$PWD/http/responsebuilder.h \
+    $$PWD/iconprovider.h \
+    $$PWD/indexrange.h \
+    $$PWD/logger.h \
     $$PWD/net/dnsupdater.h \
-    $$PWD/net/downloadmanager.h \
     $$PWD/net/downloadhandler.h \
+    $$PWD/net/downloadmanager.h \
     $$PWD/net/geoipmanager.h \
     $$PWD/net/portforwarder.h \
+    $$PWD/net/private/geoipdatabase.h \
     $$PWD/net/proxyconfigurationmanager.h \
     $$PWD/net/reverseresolution.h \
     $$PWD/net/smtp.h \
-    $$PWD/net/private/geoipdatabase.h \
-    $$PWD/bittorrent/addtorrentparams.h  \
-    $$PWD/bittorrent/infohash.h \
-    $$PWD/bittorrent/session.h \
-    $$PWD/bittorrent/sessionstatus.h \
-    $$PWD/bittorrent/cachestatus.h \
-    $$PWD/bittorrent/magneturi.h \
-    $$PWD/bittorrent/torrentinfo.h \
-    $$PWD/bittorrent/torrenthandle.h \
-    $$PWD/bittorrent/peerinfo.h \
-    $$PWD/bittorrent/trackerentry.h \
-    $$PWD/bittorrent/tracker.h \
-    $$PWD/bittorrent/torrentcreatorthread.h \
-    $$PWD/bittorrent/private/speedmonitor.h \
-    $$PWD/bittorrent/private/bandwidthscheduler.h \
-    $$PWD/bittorrent/private/filterparserthread.h \
-    $$PWD/bittorrent/private/statistics.h \
-    $$PWD/bittorrent/private/resumedatasavingmanager.h \
+    $$PWD/preferences.h \
+    $$PWD/private/profile_p.h \
+    $$PWD/profile.h \
+    $$PWD/rss/private/rss_parser.h \
     $$PWD/rss/rss_article.h \
-    $$PWD/rss/rss_item.h \
-    $$PWD/rss/rss_feed.h \
-    $$PWD/rss/rss_folder.h \
-    $$PWD/rss/rss_session.h \
     $$PWD/rss/rss_autodownloader.h \
     $$PWD/rss/rss_autodownloadrule.h \
-    $$PWD/rss/private/rss_parser.h \
+    $$PWD/rss/rss_feed.h \
+    $$PWD/rss/rss_folder.h \
+    $$PWD/rss/rss_item.h \
+    $$PWD/rss/rss_session.h \
+    $$PWD/scanfoldersmodel.h \
+    $$PWD/search/searchhandler.h \
+    $$PWD/search/searchdownloadhandler.h \
+    $$PWD/search/searchpluginmanager.h \
+    $$PWD/settingsstorage.h \
+    $$PWD/settingvalue.h \
+    $$PWD/torrentfileguard.h \
+    $$PWD/torrentfilter.h \
+    $$PWD/tristatebool.h \
+    $$PWD/types.h \
+    $$PWD/unicodestrings.h \
+    $$PWD/utils/bytearray.h \
+    $$PWD/utils/foreignapps.h \
     $$PWD/utils/fs.h \
     $$PWD/utils/gzip.h \
     $$PWD/utils/misc.h \
     $$PWD/utils/net.h \
     $$PWD/utils/random.h \
     $$PWD/utils/string.h \
-    $$PWD/utils/version.h \
-    $$PWD/profile.h \
-    $$PWD/private/profile_p.h \
-    $$PWD/unicodestrings.h \
-    $$PWD/torrentfileguard.h \
-    $$PWD/torrentfilter.h \
-    $$PWD/scanfoldersmodel.h \
-    $$PWD/searchengine.h \
-    $$PWD/global.h
+    $$PWD/utils/version.h
 
 SOURCES += \
     $$PWD/asyncfilestorage.cpp \
-    $$PWD/tristatebool.cpp \
+    $$PWD/bittorrent/infohash.cpp \
+    $$PWD/bittorrent/magneturi.cpp \
+    $$PWD/bittorrent/peerinfo.cpp \
+    $$PWD/bittorrent/private/bandwidthscheduler.cpp \
+    $$PWD/bittorrent/private/filterparserthread.cpp \
+    $$PWD/bittorrent/private/resumedatasavingmanager.cpp \
+    $$PWD/bittorrent/private/speedmonitor.cpp \
+    $$PWD/bittorrent/private/statistics.cpp \
+    $$PWD/bittorrent/session.cpp \
+    $$PWD/bittorrent/torrentcreatorthread.cpp \
+    $$PWD/bittorrent/torrenthandle.cpp \
+    $$PWD/bittorrent/torrentinfo.cpp \
+    $$PWD/bittorrent/tracker.cpp \
+    $$PWD/bittorrent/trackerentry.cpp \
+    $$PWD/exceptions.cpp \
     $$PWD/filesystemwatcher.cpp \
-    $$PWD/logger.cpp \
-    $$PWD/settingsstorage.cpp \
-    $$PWD/preferences.cpp \
-    $$PWD/iconprovider.cpp \
     $$PWD/http/connection.cpp \
+    $$PWD/http/httperror.cpp \
     $$PWD/http/requestparser.cpp \
+    $$PWD/http/responsebuilder.cpp \
     $$PWD/http/responsegenerator.cpp \
     $$PWD/http/server.cpp \
-    $$PWD/http/responsebuilder.cpp \
+    $$PWD/iconprovider.cpp \
+    $$PWD/logger.cpp \
     $$PWD/net/dnsupdater.cpp \
-    $$PWD/net/downloadmanager.cpp \
     $$PWD/net/downloadhandler.cpp \
+    $$PWD/net/downloadmanager.cpp \
     $$PWD/net/geoipmanager.cpp \
     $$PWD/net/portforwarder.cpp \
+    $$PWD/net/private/geoipdatabase.cpp \
     $$PWD/net/proxyconfigurationmanager.cpp \
     $$PWD/net/reverseresolution.cpp \
     $$PWD/net/smtp.cpp \
-    $$PWD/net/private/geoipdatabase.cpp \
-    $$PWD/bittorrent/infohash.cpp \
-    $$PWD/bittorrent/session.cpp \
-    $$PWD/bittorrent/magneturi.cpp \
-    $$PWD/bittorrent/torrentinfo.cpp \
-    $$PWD/bittorrent/torrenthandle.cpp \
-    $$PWD/bittorrent/peerinfo.cpp \
-    $$PWD/bittorrent/trackerentry.cpp \
-    $$PWD/bittorrent/tracker.cpp \
-    $$PWD/bittorrent/torrentcreatorthread.cpp \
-    $$PWD/bittorrent/private/speedmonitor.cpp \
-    $$PWD/bittorrent/private/bandwidthscheduler.cpp \
-    $$PWD/bittorrent/private/filterparserthread.cpp \
-    $$PWD/bittorrent/private/statistics.cpp \
-    $$PWD/bittorrent/private/resumedatasavingmanager.cpp \
+    $$PWD/preferences.cpp \
+    $$PWD/private/profile_p.cpp \
+    $$PWD/profile.cpp \
+    $$PWD/rss/private/rss_parser.cpp \
     $$PWD/rss/rss_article.cpp \
-    $$PWD/rss/rss_item.cpp \
-    $$PWD/rss/rss_feed.cpp \
-    $$PWD/rss/rss_folder.cpp \
-    $$PWD/rss/rss_session.cpp \
     $$PWD/rss/rss_autodownloader.cpp \
     $$PWD/rss/rss_autodownloadrule.cpp \
-    $$PWD/rss/private/rss_parser.cpp \
+    $$PWD/rss/rss_feed.cpp \
+    $$PWD/rss/rss_folder.cpp \
+    $$PWD/rss/rss_item.cpp \
+    $$PWD/rss/rss_session.cpp \
+    $$PWD/scanfoldersmodel.cpp \
+    $$PWD/search/searchdownloadhandler.cpp \
+    $$PWD/search/searchhandler.cpp \
+    $$PWD/search/searchpluginmanager.cpp \
+    $$PWD/settingsstorage.cpp \
+    $$PWD/torrentfileguard.cpp \
+    $$PWD/torrentfilter.cpp \
+    $$PWD/tristatebool.cpp \
+    $$PWD/utils/bytearray.cpp \
+    $$PWD/utils/foreignapps.cpp \
     $$PWD/utils/fs.cpp \
     $$PWD/utils/gzip.cpp \
     $$PWD/utils/misc.cpp \
     $$PWD/utils/net.cpp \
     $$PWD/utils/random.cpp \
-    $$PWD/utils/string.cpp \
-    $$PWD/profile.cpp \
-    $$PWD/private/profile_p.cpp \
-    $$PWD/torrentfileguard.cpp \
-    $$PWD/torrentfilter.cpp \
-    $$PWD/scanfoldersmodel.cpp \
-    $$PWD/searchengine.cpp
+    $$PWD/utils/string.cpp

src/base/bittorrent/infohash.cpp

@@ -26,9 +26,10 @@
  * exception statement from your version.
  */
 
-#include <QHash>
 #include "infohash.h"
 
+#include <QHash>
+
 using namespace BitTorrent;
 
 InfoHash::InfoHash()
@@ -91,7 +92,7 @@ bool InfoHash::operator!=(const InfoHash &other) const
     return (m_nativeHash != other.m_nativeHash);
 }
 
-uint qHash(const InfoHash &key, uint seed)
+uint BitTorrent::qHash(const InfoHash &key, uint seed)
 {
     return qHash(static_cast<QString>(key), seed);
 }

src/base/bittorrent/infohash.h

@@ -29,8 +29,8 @@
 #ifndef BITTORRENT_INFOHASH_H
 #define BITTORRENT_INFOHASH_H
 
-#include <QString>
 #include <libtorrent/sha1_hash.hpp>
+#include <QString>
 
 namespace BitTorrent
 {
@@ -54,8 +54,8 @@ namespace BitTorrent
         libtorrent::sha1_hash m_nativeHash;
         QString m_hashString;
     };
+
+    uint qHash(const InfoHash &key, uint seed);
 }
 
-uint qHash(const BitTorrent::InfoHash &key, uint seed);
-
 #endif // BITTORRENT_INFOHASH_H

src/base/bittorrent/magneturi.cpp

@@ -26,16 +26,17 @@
  * exception statement from your version.
  */
 
-#include <QByteArray>
-#include <QRegExp>
-#include <QStringList>
+#include "magneturi.h"
 
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/error_code.hpp>
 #include <libtorrent/magnet_uri.hpp>
 
+#include <QByteArray>
+#include <QRegularExpression>
+#include <QStringList>
+
 #include "base/utils/string.h"
-#include "magneturi.h"
 
 namespace
 {
@@ -45,7 +46,7 @@ namespace
         rawBc = rawBc.mid(8); // skip bc://bt/
         rawBc = QByteArray::fromBase64(rawBc); // Decode base64
         // Format is now AA/url_encoded_filename/size_bytes/info_hash/ZZ
-        QStringList parts = QString(rawBc).split("/");
+        QStringList parts = QString(rawBc).split('/');
         if (parts.size() != 5) return QString();
 
         QString filename = parts.at(1);
@@ -69,8 +70,8 @@ MagnetUri::MagnetUri(const QString &source)
         qDebug("Creating magnet link from bc link");
         m_url = bcLinkToMagnet(source);
     }
-    else if (((source.size() == 40) && !source.contains(QRegExp("[^0-9A-Fa-f]")))
-             || ((source.size() == 32) && !source.contains(QRegExp("[^2-7A-Za-z]")))) {
+    else if (((source.size() == 40) && !source.contains(QRegularExpression("[^0-9A-Fa-f]")))
+             || ((source.size() == 32) && !source.contains(QRegularExpression("[^2-7A-Za-z]")))) {
         m_url = "magnet:?xt=urn:btih:" + source;
     }
 

src/base/bittorrent/peerinfo.cpp

@@ -246,8 +246,8 @@ QString PeerInfo::connectionType() const
 
 void PeerInfo::calcRelevance(const TorrentHandle *torrent)
 {
-    const QBitArray &allPieces = torrent->pieces();
-    const QBitArray &peerPieces = pieces();
+    const QBitArray allPieces = torrent->pieces();
+    const QBitArray peerPieces = pieces();
 
     int localMissing = 0;
     int remoteHaves = 0;
@@ -273,18 +273,20 @@ qreal PeerInfo::relevance() const
 
 void PeerInfo::determineFlags()
 {
+    QStringList flagsDescriptionList;
+
     if (isInteresting()) {
         // d = Your client wants to download, but peer doesn't want to send (interested and choked)
         if (isRemoteChocked()) {
             m_flags += "d ";
-            m_flagsDescription += tr("interested(local) and choked(peer)");
-            m_flagsDescription += ", ";
+            flagsDescriptionList += "d = "
+                    + tr("Interested(local) and Choked(peer)");
         }
         else {
             // D = Currently downloading (interested and not choked)
             m_flags += "D ";
-            m_flagsDescription += tr("interested(local) and unchoked(peer)");
-            m_flagsDescription += ", ";
+            flagsDescriptionList += "D = "
+                    + tr("interested(local) and unchoked(peer)");
         }
     }
 
@@ -292,97 +294,95 @@ void PeerInfo::determineFlags()
         // u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
         if (isChocked()) {
             m_flags += "u ";
-            m_flagsDescription += tr("interested(peer) and choked(local)");
-            m_flagsDescription += ", ";
+            flagsDescriptionList += "u = "
+                    + tr("interested(peer) and choked(local)");
         }
         else {
             // U = Currently uploading (interested and not choked)
             m_flags += "U ";
-            m_flagsDescription += tr("interested(peer) and unchoked(local)");
-            m_flagsDescription += ", ";
+            flagsDescriptionList += "U = "
+                    + tr("interested(peer) and unchoked(local)");
         }
     }
 
     // O = Optimistic unchoke
     if (optimisticUnchoke()) {
         m_flags += "O ";
-        m_flagsDescription += tr("optimistic unchoke");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "O = "
+                + tr("optimistic unchoke");
     }
 
     // S = Peer is snubbed
     if (isSnubbed()) {
         m_flags += "S ";
-        m_flagsDescription += tr("peer snubbed");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "S = "
+                + tr("peer snubbed");
     }
 
     // I = Peer is an incoming connection
     if (!isLocalConnection()) {
         m_flags += "I ";
-        m_flagsDescription += tr("incoming connection");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "I = "
+                + tr("incoming connection");
     }
 
     // K = Peer is unchoking your client, but your client is not interested
     if (!isRemoteChocked() && !isInteresting()) {
         m_flags += "K ";
-        m_flagsDescription += tr("not interested(local) and unchoked(peer)");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "K = "
+                + tr("not interested(local) and unchoked(peer)");
     }
 
     // ? = Your client unchoked the peer but the peer is not interested
     if (!isChocked() && !isRemoteInterested()) {
         m_flags += "? ";
-        m_flagsDescription += tr("not interested(peer) and unchoked(local)");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "? = "
+                + tr("not interested(peer) and unchoked(local)");
     }
 
     // X = Peer was included in peerlists obtained through Peer Exchange (PEX)
     if (fromPeX()) {
         m_flags += "X ";
-        m_flagsDescription += tr("peer from PEX");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "X = "
+                + tr("peer from PEX");
     }
 
     // H = Peer was obtained through DHT
     if (fromDHT()) {
         m_flags += "H ";
-        m_flagsDescription += tr("peer from DHT");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "H = "
+                + tr("peer from DHT");
     }
 
     // E = Peer is using Protocol Encryption (all traffic)
     if (isRC4Encrypted()) {
         m_flags += "E ";
-        m_flagsDescription += tr("encrypted traffic");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "E = "
+                + tr("encrypted traffic");
     }
 
     // e = Peer is using Protocol Encryption (handshake)
     if (isPlaintextEncrypted()) {
         m_flags += "e ";
-        m_flagsDescription += tr("encrypted handshake");
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "e = "
+                + tr("encrypted handshake");
     }
 
     // P = Peer is using uTorrent uTP
     if (useUTPSocket()) {
         m_flags += "P ";
-        m_flagsDescription += QString::fromUtf8(C_UTP);
-        m_flagsDescription += ", ";
+        flagsDescriptionList += "P = "
+                + QString::fromUtf8(C_UTP);
     }
 
     // L = Peer is local
     if (fromLSD()) {
-        m_flags += "L";
-        m_flagsDescription += tr("peer from LSD");
+        m_flags += 'L';
+        flagsDescriptionList += "L = "
+                + tr("peer from LSD");
     }
-
     m_flags = m_flags.trimmed();
-    m_flagsDescription = m_flagsDescription.trimmed();
-    if (m_flagsDescription.endsWith(',', Qt::CaseInsensitive))
-        m_flagsDescription.chop(1);
+    m_flagsDescription = flagsDescriptionList.join('\n');
 }
 
 QString PeerInfo::flags() const

src/base/bittorrent/private/bandwidthscheduler.cpp

@@ -55,7 +55,7 @@ void BandwidthScheduler::start()
 
 bool BandwidthScheduler::isTimeForAlternative() const
 {
-    const Preferences* const pref = Preferences::instance();
+    const Preferences *const pref = Preferences::instance();
 
     QTime start = pref->getSchedulerStartTime();
     QTime end = pref->getSchedulerEndTime();

src/base/bittorrent/private/bandwidthscheduler.h

@@ -33,7 +33,7 @@
 #include <QObject>
 #include <QTimer>
 
-class BandwidthScheduler: public QObject
+class BandwidthScheduler : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(BandwidthScheduler)

src/base/bittorrent/private/filterparserthread.cpp

@@ -1,5 +1,5 @@
 /*
- * Bittorrent Client using Qt and libt.
+ * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -102,6 +102,7 @@ namespace
     }
 
     const int BUFFER_SIZE = 2 * 1024 * 1024; // 2 MiB
+    const int MAX_LOGGED_ERRORS = 5;
 }
 
 FilterParserThread::FilterParserThread(QObject *parent)
@@ -134,19 +135,25 @@ int FilterParserThread::parseDATFilterFile()
     int start = 0;
     int endOfLine = -1;
     int nbLine = 0;
+    int parseErrorCount = 0;
+    const auto addLog = [&parseErrorCount](const QString &msg)
+    {
+        if (parseErrorCount <= MAX_LOGGED_ERRORS)
+            LogMsg(msg, Log::CRITICAL);
+    };
 
     while (true) {
         bytesRead = file.read(buffer.data() + offset, BUFFER_SIZE - offset - 1);
         if (bytesRead < 0)
             break;
         int dataSize = bytesRead + offset;
-        if (bytesRead == 0 && dataSize == 0)
+        if ((bytesRead == 0) && (dataSize == 0))
             break;
 
         for (start = 0; start < dataSize; ++start) {
             endOfLine = -1;
             // The file might have ended without the last line having a newline
-            if (!(bytesRead == 0 && dataSize > 0)) {
+            if (!((bytesRead == 0) && (dataSize > 0))) {
                 for (int i = start; i < dataSize; ++i) {
                     if (buffer[i] == '\n') {
                         endOfLine = i;
@@ -202,7 +209,8 @@ int FilterParserThread::parseDATFilterFile()
             int endOfIPRange = ((firstComma == -1) ? (endOfLine - 1) : (firstComma - 1));
             int delimIP = findAndNullDelimiter(buffer.data(), '-', start, endOfIPRange);
             if (delimIP == -1) {
-                LogMsg(tr("IP filter line %1 is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -210,7 +218,8 @@ int FilterParserThread::parseDATFilterFile()
             libt::address startAddr;
             int newStart = trim(buffer.data(), start, delimIP - 1);
             if (!parseIPAddress(buffer.data() + newStart, startAddr)) {
-                LogMsg(tr("IP filter line %1 is malformed. Start IP of the range is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. Start IP of the range is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -218,14 +227,16 @@ int FilterParserThread::parseDATFilterFile()
             libt::address endAddr;
             newStart = trim(buffer.data(), delimIP + 1, endOfIPRange);
             if (!parseIPAddress(buffer.data() + newStart, endAddr)) {
-                LogMsg(tr("IP filter line %1 is malformed. End IP of the range is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. End IP of the range is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
 
             if ((startAddr.is_v4() != endAddr.is_v4())
                 || (startAddr.is_v6() != endAddr.is_v6())) {
-                LogMsg(tr("IP filter line %1 is malformed. One IP is IPv4 and the other is IPv6!").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. One IP is IPv4 and the other is IPv6!").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -238,8 +249,9 @@ int FilterParserThread::parseDATFilterFile()
                 ++ruleCount;
             }
             catch (std::exception &e) {
-                LogMsg(tr("IP filter exception thrown for line %1. Exception is: %2").arg(nbLine)
-                                               .arg(QString::fromLocal8Bit(e.what())), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter exception thrown for line %1. Exception is: %2")
+                       .arg(nbLine).arg(QString::fromLocal8Bit(e.what())));
             }
         }
 
@@ -247,6 +259,9 @@ int FilterParserThread::parseDATFilterFile()
             offset = 0;
     }
 
+    if (parseErrorCount > MAX_LOGGED_ERRORS)
+        LogMsg(tr("%1 extra IP filter parsing errors occurred.", "513 extra IP filter parsing errors occurred.")
+               .arg(parseErrorCount - MAX_LOGGED_ERRORS), Log::CRITICAL);
     return ruleCount;
 }
 
@@ -268,19 +283,25 @@ int FilterParserThread::parseP2PFilterFile()
     int start = 0;
     int endOfLine = -1;
     int nbLine = 0;
+    int parseErrorCount = 0;
+    const auto addLog = [&parseErrorCount](const QString &msg)
+    {
+        if (parseErrorCount <= MAX_LOGGED_ERRORS)
+            LogMsg(msg, Log::CRITICAL);
+    };
 
     while (true) {
         bytesRead = file.read(buffer.data() + offset, BUFFER_SIZE - offset - 1);
         if (bytesRead < 0)
             break;
         int dataSize = bytesRead + offset;
-        if (bytesRead == 0 && dataSize == 0)
+        if ((bytesRead == 0) && (dataSize == 0))
             break;
 
         for (start = 0; start < dataSize; ++start) {
             endOfLine = -1;
             // The file might have ended without the last line having a newline
-            if (!(bytesRead == 0 && dataSize > 0)) {
+            if (!((bytesRead == 0) && (dataSize > 0))) {
                 for (int i = start; i < dataSize; ++i) {
                     if (buffer[i] == '\n') {
                         endOfLine = i;
@@ -319,7 +340,8 @@ int FilterParserThread::parseP2PFilterFile()
             // The "Some organization" part might contain a ':' char itself so we find the last occurrence
             int partsDelimiter = findAndNullDelimiter(buffer.data(), ':', start, endOfLine, true);
             if (partsDelimiter == -1) {
-                LogMsg(tr("IP filter line %1 is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -327,7 +349,8 @@ int FilterParserThread::parseP2PFilterFile()
             // IP Range should be split by a dash
             int delimIP = findAndNullDelimiter(buffer.data(), '-', partsDelimiter + 1, endOfLine);
             if (delimIP == -1) {
-                LogMsg(tr("IP filter line %1 is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -335,7 +358,8 @@ int FilterParserThread::parseP2PFilterFile()
             libt::address startAddr;
             int newStart = trim(buffer.data(), partsDelimiter + 1, delimIP - 1);
             if (!parseIPAddress(buffer.data() + newStart, startAddr)) {
-                LogMsg(tr("IP filter line %1 is malformed. Start IP of the range is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. Start IP of the range is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -343,14 +367,16 @@ int FilterParserThread::parseP2PFilterFile()
             libt::address endAddr;
             newStart = trim(buffer.data(), delimIP + 1, endOfLine);
             if (!parseIPAddress(buffer.data() + newStart, endAddr)) {
-                LogMsg(tr("IP filter line %1 is malformed. End IP of the range is malformed.").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. End IP of the range is malformed.").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
 
             if ((startAddr.is_v4() != endAddr.is_v4())
                 || (startAddr.is_v6() != endAddr.is_v6())) {
-                LogMsg(tr("IP filter line %1 is malformed. One IP is IPv4 and the other is IPv6!").arg(nbLine), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter line %1 is malformed. One IP is IPv4 and the other is IPv6!").arg(nbLine));
                 start = endOfLine;
                 continue;
             }
@@ -362,8 +388,9 @@ int FilterParserThread::parseP2PFilterFile()
                 ++ruleCount;
             }
             catch (std::exception &e) {
-                LogMsg(tr("IP filter exception thrown for line %1. Exception is: %2").arg(nbLine)
-                       .arg(QString::fromLocal8Bit(e.what())), Log::CRITICAL);
+                ++parseErrorCount;
+                addLog(tr("IP filter exception thrown for line %1. Exception is: %2")
+                       .arg(nbLine).arg(QString::fromLocal8Bit(e.what())));
             }
         }
 
@@ -371,30 +398,33 @@ int FilterParserThread::parseP2PFilterFile()
             offset = 0;
     }
 
+    if (parseErrorCount > MAX_LOGGED_ERRORS)
+        LogMsg(tr("%1 extra IP filter parsing errors occurred.", "513 extra IP filter parsing errors occurred.")
+               .arg(parseErrorCount - MAX_LOGGED_ERRORS), Log::CRITICAL);
     return ruleCount;
 }
 
 int FilterParserThread::getlineInStream(QDataStream &stream, std::string &name, char delim)
 {
     char c;
-    int total_read = 0;
+    int totalRead = 0;
     int read;
     do {
         read = stream.readRawData(&c, 1);
-        total_read += read;
+        totalRead += read;
         if (read > 0) {
             if (c != delim) {
                 name += c;
             }
             else {
                 // Delim found
-                return total_read;
+                return totalRead;
             }
         }
     }
-    while(read > 0);
+    while (read > 0);
 
-    return total_read;
+    return totalRead;
 }
 
 // Parser for PeerGuardian ip filter in p2p format
@@ -425,7 +455,7 @@ int FilterParserThread::parseP2BFilterFile()
         unsigned int start, end;
 
         std::string name;
-        while(getlineInStream(stream, name, '\0') && !m_abort) {
+        while (getlineInStream(stream, name, '\0') && !m_abort) {
             if (!stream.readRawData(reinterpret_cast<char*>(&start), sizeof(start))
                 || !stream.readRawData(reinterpret_cast<char*>(&end), sizeof(end))) {
                 LogMsg(tr("Parsing Error: The filter file is not a valid PeerGuardian P2B file."), Log::CRITICAL);
@@ -580,7 +610,7 @@ int FilterParserThread::findAndNullDelimiter(char *const data, char delimiter, i
     return -1;
 }
 
-int FilterParserThread::trim(char* const data, int start, int end)
+int FilterParserThread::trim(char *const data, int start, int end)
 {
     if (start >= end) return start;
     int newStart = start;

src/base/bittorrent/private/resumedatasavingmanager.cpp

@@ -26,12 +26,13 @@
  * exception statement from your version.
  */
 
+#include "resumedatasavingmanager.h"
+
 #include <QDebug>
 #include <QSaveFile>
 
 #include "base/logger.h"
 #include "base/utils/fs.h"
-#include "resumedatasavingmanager.h"
 
 ResumeDataSavingManager::ResumeDataSavingManager(const QString &resumeFolderPath)
     : m_resumeDataDir(resumeFolderPath)
@@ -49,7 +50,7 @@ void ResumeDataSavingManager::saveResumeData(QString infoHash, QByteArray data)
         resumeFile.write(data);
         if (!resumeFile.commit()) {
             Logger::instance()->addMessage(QString("Couldn't save resume data in %1. Error: %2")
-                                           .arg(filepath).arg(resumeFile.errorString()), Log::WARNING);
+                                           .arg(filepath, resumeFile.errorString()), Log::WARNING);
         }
     }
 }

src/base/bittorrent/private/statistics.cpp

@@ -22,7 +22,7 @@ Statistics::Statistics(Session *session)
     , m_dirty(false)
 {
     load();
-    connect(&m_timer, SIGNAL(timeout()), this, SLOT(gather()));
+    connect(&m_timer, &QTimer::timeout, this, &Statistics::gather);
     m_timer.start(60 * 1000);
 }
 

src/base/bittorrent/private/statistics.h

@@ -9,7 +9,7 @@ namespace BitTorrent
     class Session;
 }
 
-class Statistics : QObject
+class Statistics : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY(Statistics)
@@ -28,7 +28,6 @@ private:
     void save() const;
     void load();
 
-private:
     BitTorrent::Session *m_session;
     // Will overflow at 15.9 EiB
     quint64 m_alltimeUL;

src/base/bittorrent/session.h

@@ -30,18 +30,14 @@
 #ifndef BITTORRENT_SESSION_H
 #define BITTORRENT_SESSION_H
 
-#include <vector>
 #include <libtorrent/version.hpp>
 
-#if LIBTORRENT_VERSION_NUM >= 10100
-#include <QElapsedTimer>
-#endif
+#include <vector>
+
 #include <QFile>
 #include <QHash>
+#include <QList>
 #include <QMap>
-#if LIBTORRENT_VERSION_NUM < 10100
-#include <QMutex>
-#endif
 #include <QNetworkConfigurationManager>
 #include <QPointer>
 #include <QSet>
@@ -49,6 +45,12 @@
 #include <QVector>
 #include <QWaitCondition>
 
+#if LIBTORRENT_VERSION_NUM < 10100
+#include <QMutex>
+#else
+#include <QElapsedTimer>
+#endif
+
 #include "base/settingvalue.h"
 #include "base/tristatebool.h"
 #include "base/types.h"
@@ -111,7 +113,6 @@ class QTimer;
 class QStringList;
 class QString;
 class QUrl;
-template<typename T> class QList;
 
 class FilterParserThread;
 class BandwidthScheduler;
@@ -137,7 +138,7 @@ namespace BitTorrent
     class Tracker;
     class MagnetUri;
     class TrackerEntry;
-    struct AddTorrentData;
+    struct CreateTorrentParams;
 
     struct TorrentStatusReport
     {
@@ -374,6 +375,8 @@ namespace BitTorrent
         void setAnnounceToAllTrackers(bool val);
         bool announceToAllTiers() const;
         void setAnnounceToAllTiers(bool val);
+        int asyncIOThreads() const;
+        void setAsyncIOThreads(int num);
         int diskCacheSize() const;
         void setDiskCacheSize(int size);
         int diskCacheTTL() const;
@@ -382,6 +385,8 @@ namespace BitTorrent
         void setUseOSCache(bool use);
         bool isGuidedReadCacheEnabled() const;
         void setGuidedReadCacheEnabled(bool enabled);
+        bool isCoalesceReadWriteEnabled() const;
+        void setCoalesceReadWriteEnabled(bool enabled);
         bool isSuggestModeEnabled() const;
         void setSuggestMode(bool mode);
         int sendBufferWatermark() const;
@@ -396,6 +401,12 @@ namespace BitTorrent
         void setQueueingSystemEnabled(bool enabled);
         bool ignoreSlowTorrentsForQueueing() const;
         void setIgnoreSlowTorrentsForQueueing(bool ignore);
+        int downloadRateForSlowTorrents() const;
+        void setDownloadRateForSlowTorrents(int rateInKibiBytes);
+        int uploadRateForSlowTorrents() const;
+        void setUploadRateForSlowTorrents(int rateInKibiBytes);
+        int slowTorrentsInactivityTimer() const;
+        void setSlowTorrentsInactivityTimer(int timeInSeconds);
         int outgoingPortsMin() const;
         void setOutgoingPortsMin(int min);
         int outgoingPortsMax() const;
@@ -443,6 +454,7 @@ namespace BitTorrent
         TorrentStatusReport torrentStatusReport() const;
         bool hasActiveTorrents() const;
         bool hasUnfinishedTorrents() const;
+        bool hasRunningSeed() const;
         const SessionStatus &status() const;
         const CacheStatus &cacheStatus() const;
         quint64 getAlltimeDL() const;
@@ -469,6 +481,7 @@ namespace BitTorrent
 
         // TorrentHandle interface
         void handleTorrentShareLimitChanged(TorrentHandle *const torrent);
+        void handleTorrentNameChanged(TorrentHandle *const torrent);
         void handleTorrentSavePathChanged(TorrentHandle *const torrent);
         void handleTorrentCategoryChanged(TorrentHandle *const torrent, const QString &oldCategory);
         void handleTorrentTagAdded(TorrentHandle *const torrent, const QString &tag);
@@ -538,7 +551,7 @@ namespace BitTorrent
         void generateResumeData(bool final = false);
         void handleIPFilterParsed(int ruleCount);
         void handleIPFilterError();
-        void handleDownloadFinished(const QString &url, const QString &filePath);
+        void handleDownloadFinished(const QString &url, const QByteArray &data);
         void handleDownloadFailed(const QString &url, const QString &reason);
         void handleRedirectedToMagnet(const QString &url, const QString &magnetUri);
 
@@ -554,7 +567,7 @@ namespace BitTorrent
             bool requestedFileDeletion;
         };
 
-        explicit Session(QObject *parent = 0);
+        explicit Session(QObject *parent = nullptr);
         ~Session();
 
         bool hasPerTorrentRatioLimit() const;
@@ -586,7 +599,7 @@ namespace BitTorrent
         void enableIPFilter();
         void disableIPFilter();
 
-        bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
+        bool addTorrent_impl(CreateTorrentParams params, const MagnetUri &magnetUri,
                              TorrentInfo torrentInfo = TorrentInfo(),
                              const QByteArray &fastresumeData = QByteArray());
         bool findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) const;
@@ -642,10 +655,12 @@ namespace BitTorrent
         CachedSettingValue<QString> m_IPFilterFile;
         CachedSettingValue<bool> m_announceToAllTrackers;
         CachedSettingValue<bool> m_announceToAllTiers;
+        CachedSettingValue<int> m_asyncIOThreads;
         CachedSettingValue<int> m_diskCacheSize;
         CachedSettingValue<int> m_diskCacheTTL;
         CachedSettingValue<bool> m_useOSCache;
         CachedSettingValue<bool> m_guidedReadCacheEnabled;
+        CachedSettingValue<bool> m_coalesceReadWriteEnabled;
         CachedSettingValue<bool> m_isSuggestMode;
         CachedSettingValue<int> m_sendBufferWatermark;
         CachedSettingValue<int> m_sendBufferLowWatermark;
@@ -656,6 +671,9 @@ namespace BitTorrent
         CachedSettingValue<int> m_maxActiveUploads;
         CachedSettingValue<int> m_maxActiveTorrents;
         CachedSettingValue<bool> m_ignoreSlowTorrentsForQueueing;
+        CachedSettingValue<int> m_downloadRateForSlowTorrents;
+        CachedSettingValue<int> m_uploadRateForSlowTorrents;
+        CachedSettingValue<int> m_slowTorrentsInactivityTimer;
         CachedSettingValue<int> m_outgoingPortsMin;
         CachedSettingValue<int> m_outgoingPortsMax;
         CachedSettingValue<bool> m_ignoreLimitsOnLAN;
@@ -741,13 +759,17 @@ namespace BitTorrent
 
         QHash<InfoHash, TorrentInfo> m_loadedMetadata;
         QHash<InfoHash, TorrentHandle *> m_torrents;
-        QHash<InfoHash, AddTorrentData> m_addingTorrents;
+        QHash<InfoHash, CreateTorrentParams> m_addingTorrents;
         QHash<QString, AddTorrentParams> m_downloadedTorrents;
         QHash<InfoHash, RemovingTorrentData> m_removingTorrents;
         TorrentStatusReport m_torrentStatusReport;
         QStringMap m_categories;
         QSet<QString> m_tags;
 
+        // I/O errored torrents
+        QSet<InfoHash> m_recentErroredTorrents;
+        QTimer *m_recentErroredTorrentsTimer;
+
 #if LIBTORRENT_VERSION_NUM < 10100
         QMutex m_alertsMutex;
         QWaitCondition m_alertsWaitCondition;

src/base/bittorrent/torrentcreatorthread.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
+ * Copyright (C) 2010  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "torrentcreatorthread.h"
@@ -37,9 +35,14 @@
 #include <libtorrent/create_torrent.hpp>
 #include <libtorrent/storage.hpp>
 #include <libtorrent/torrent_info.hpp>
+#include <libtorrent/version.hpp>
 
+#include <QDirIterator>
 #include <QFile>
+#include <QFileInfo>
+#include <QHash>
 
+#include "base/global.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
@@ -59,8 +62,6 @@ using namespace BitTorrent;
 
 TorrentCreatorThread::TorrentCreatorThread(QObject *parent)
     : QThread(parent)
-    , m_private(false)
-    , m_pieceSize(0)
 {
 }
 
@@ -70,106 +71,149 @@ TorrentCreatorThread::~TorrentCreatorThread()
     wait();
 }
 
-void TorrentCreatorThread::create(const QString &inputPath, const QString &savePath, const QStringList &trackers,
-                                  const QStringList &urlSeeds, const QString &comment, bool isPrivate, int pieceSize)
+void TorrentCreatorThread::create(const TorrentCreatorParams &params)
 {
-    m_inputPath = Utils::Fs::fromNativePath(inputPath);
-    m_savePath = Utils::Fs::fromNativePath(savePath);
-    if (QFile(m_savePath).exists())
-        Utils::Fs::forceRemove(m_savePath);
-    m_trackers = trackers;
-    m_urlSeeds = urlSeeds;
-    m_comment = comment;
-    m_private = isPrivate;
-    m_pieceSize = pieceSize;
-
+    m_params = params;
     start();
 }
 
-void TorrentCreatorThread::sendProgressSignal(int numHashes, int numPieces)
+void TorrentCreatorThread::sendProgressSignal(int currentPieceIdx, int totalPieces)
 {
-    emit updateProgress(static_cast<int>((numHashes * 100.) / numPieces));
+    emit updateProgress(static_cast<int>((currentPieceIdx * 100.) / totalPieces));
 }
 
 void TorrentCreatorThread::run()
 {
+    const QString creatorStr("qBittorrent " QBT_VERSION);
+
     emit updateProgress(0);
 
-    QString creator_str("qBittorrent " QBT_VERSION);
     try {
-        libt::file_storage fs;
+        const QString parentPath = Utils::Fs::branchPath(m_params.inputPath) + '/';
+
         // Adding files to the torrent
-        libt::add_files(fs, Utils::Fs::toNativePath(m_inputPath).toStdString(), fileFilter);
+        libt::file_storage fs;
+        if (QFileInfo(m_params.inputPath).isFile()) {
+            libt::add_files(fs, Utils::Fs::toNativePath(m_params.inputPath).toStdString(), fileFilter);
+        }
+        else {
+            // need to sort the file names by natural sort order
+            QStringList dirs = {m_params.inputPath};
+
+            QDirIterator dirIter(m_params.inputPath, (QDir::AllDirs | QDir::NoDotAndDotDot), QDirIterator::Subdirectories);
+            while (dirIter.hasNext()) {
+                dirIter.next();
+                dirs += dirIter.filePath();
+            }
+            std::sort(dirs.begin(), dirs.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
+
+            QStringList fileNames;
+            QHash<QString, boost::int64_t> fileSizeMap;
+
+            for (const auto &dir : qAsConst(dirs)) {
+                QStringList tmpNames;  // natural sort files within each dir
+
+                QDirIterator fileIter(dir, QDir::Files);
+                while (fileIter.hasNext()) {
+                    fileIter.next();
+
+                    const QString relFilePath = fileIter.filePath().mid(parentPath.length());
+                    tmpNames += relFilePath;
+                    fileSizeMap[relFilePath] = fileIter.fileInfo().size();
+                }
+
+                std::sort(tmpNames.begin(), tmpNames.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
+                fileNames += tmpNames;
+            }
+
+            for (const auto &fileName : qAsConst(fileNames))
+                fs.add_file(fileName.toStdString(), fileSizeMap[fileName]);
+        }
 
         if (isInterruptionRequested()) return;
 
-        libt::create_torrent t(fs, m_pieceSize);
+#if LIBTORRENT_VERSION_NUM < 10100
+        libt::create_torrent newTorrent(fs, m_params.pieceSize, -1
+            , (m_params.isAlignmentOptimized ? libt::create_torrent::optimize : 0));
+#else
+        libt::create_torrent newTorrent(fs, m_params.pieceSize, -1
+            , (m_params.isAlignmentOptimized ? libt::create_torrent::optimize_alignment : 0));
+#endif
 
         // Add url seeds
-        foreach (const QString &seed, m_urlSeeds)
-            t.add_url_seed(seed.trimmed().toStdString());
+        foreach (QString seed, m_params.urlSeeds) {
+            seed = seed.trimmed();
+            if (!seed.isEmpty())
+                newTorrent.add_url_seed(seed.toStdString());
+        }
 
         int tier = 0;
-        bool newline = false;
-        foreach (const QString &tracker, m_trackers) {
-            if (tracker.isEmpty()) {
-                if (newline)
-                    continue;
+        foreach (const QString &tracker, m_params.trackers) {
+            if (tracker.isEmpty())
                 ++tier;
-                newline = true;
-                continue;
-            }
-            t.add_tracker(tracker.trimmed().toStdString(), tier);
-            newline = false;
+            else
+                newTorrent.add_tracker(tracker.trimmed().toStdString(), tier);
         }
 
         if (isInterruptionRequested()) return;
 
         // calculate the hash for all pieces
-        const QString parentPath = Utils::Fs::branchPath(m_inputPath) + "/";
-        libt::set_piece_hashes(t, Utils::Fs::toNativePath(parentPath).toStdString(), boost::bind(&TorrentCreatorThread::sendProgressSignal, this, _1, t.num_pieces()));
+        libt::set_piece_hashes(newTorrent, Utils::Fs::toNativePath(parentPath).toStdString()
+            , [this, &newTorrent](const int n) { sendProgressSignal(n, newTorrent.num_pieces()); });
         // Set qBittorrent as creator and add user comment to
         // torrent_info structure
-        t.set_creator(creator_str.toUtf8().constData());
-        t.set_comment(m_comment.toUtf8().constData());
+        newTorrent.set_creator(creatorStr.toUtf8().constData());
+        newTorrent.set_comment(m_params.comment.toUtf8().constData());
         // Is private ?
-        t.set_priv(m_private);
+        newTorrent.set_priv(m_params.isPrivate);
 
         if (isInterruptionRequested()) return;
 
-        // create the torrent and print it to out
-        qDebug("Saving to %s", qUtf8Printable(m_savePath));
+        libt::entry entry = newTorrent.generate();
+
+        // add source field
+        if (!m_params.source.isEmpty())
+            entry["info"]["source"] = m_params.source.toStdString();
+
+        if (isInterruptionRequested()) return;
+
+        // create the torrent
+        std::ofstream outfile(
 #ifdef _MSC_VER
-        wchar_t *savePathW = new wchar_t[m_savePath.length() + 1];
-        int len = Utils::Fs::toNativePath(m_savePath).toWCharArray(savePathW);
-        savePathW[len] = L'\0';
-        std::ofstream outfile(savePathW, std::ios_base::out | std::ios_base::binary);
-        delete[] savePathW;
+            Utils::Fs::toNativePath(m_params.savePath).toStdWString().c_str()
 #else
-        std::ofstream outfile(Utils::Fs::toNativePath(m_savePath).toLocal8Bit().constData(), std::ios_base::out | std::ios_base::binary);
+            Utils::Fs::toNativePath(m_params.savePath).toUtf8().constData()
 #endif
+            , (std::ios_base::out | std::ios_base::binary | std::ios_base::trunc));
         if (outfile.fail())
-            throw std::exception();
+            throw std::runtime_error(tr("create new torrent file failed").toStdString());
 
         if (isInterruptionRequested()) return;
 
-        libt::bencode(std::ostream_iterator<char>(outfile), t.generate());
+        libt::bencode(std::ostream_iterator<char>(outfile), entry);
         outfile.close();
 
         emit updateProgress(100);
-        emit creationSuccess(m_savePath, parentPath);
+        emit creationSuccess(m_params.savePath, parentPath);
     }
-    catch (std::exception& e) {
-        emit creationFailure(QString::fromStdString(e.what()));
+    catch (const std::exception &e) {
+        emit creationFailure(e.what());
     }
 }
 
-int TorrentCreatorThread::calculateTotalPieces(const QString &inputPath, const int pieceSize)
+int TorrentCreatorThread::calculateTotalPieces(const QString &inputPath, const int pieceSize, const bool isAlignmentOptimized)
 {
     if (inputPath.isEmpty())
         return 0;
 
     libt::file_storage fs;
     libt::add_files(fs, Utils::Fs::toNativePath(inputPath).toStdString(), fileFilter);
-    return libt::create_torrent(fs, pieceSize).num_pieces();
+
+#if LIBTORRENT_VERSION_NUM < 10100
+    return libt::create_torrent(fs, pieceSize, -1
+        , (isAlignmentOptimized ? libt::create_torrent::optimize : 0)).num_pieces();
+#else
+    return libt::create_torrent(fs, pieceSize, -1
+        , (isAlignmentOptimized ? libt::create_torrent::optimize_alignment : 0)).num_pieces();
+#endif
 }

src/base/bittorrent/torrentcreatorthread.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2010  Christophe Dumez
+ * Copyright (C) 2010  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,8 +24,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #ifndef BITTORRENT_TORRENTCREATORTHREAD_H
@@ -36,18 +34,30 @@
 
 namespace BitTorrent
 {
+    struct TorrentCreatorParams
+    {
+        bool isPrivate;
+        bool isAlignmentOptimized;
+        int pieceSize;
+        QString inputPath;
+        QString savePath;
+        QString comment;
+        QString source;
+        QStringList trackers;
+        QStringList urlSeeds;
+    };
+
     class TorrentCreatorThread : public QThread
     {
         Q_OBJECT
 
     public:
-        TorrentCreatorThread(QObject *parent = 0);
+        TorrentCreatorThread(QObject *parent = nullptr);
         ~TorrentCreatorThread();
 
-        void create(const QString &inputPath, const QString &savePath, const QStringList &trackers,
-                    const QStringList &urlSeeds, const QString &comment, bool isPrivate, int pieceSize);
+        void create(const TorrentCreatorParams &params);
 
-        static int calculateTotalPieces(const QString &inputPath, const int pieceSize);
+        static int calculateTotalPieces(const QString &inputPath, const int pieceSize, const bool isAlignmentOptimized);
 
     protected:
         void run();
@@ -58,15 +68,9 @@ namespace BitTorrent
         void updateProgress(int progress);
 
     private:
-        void sendProgressSignal(int numHashes, int numPieces);
+        void sendProgressSignal(int currentPieceIdx, int totalPieces);
 
-        QString m_inputPath;
-        QString m_savePath;
-        QStringList m_trackers;
-        QStringList m_urlSeeds;
-        QString m_comment;
-        bool m_private;
-        int m_pieceSize;
+        TorrentCreatorParams m_params;
     };
 }
 

src/base/bittorrent/torrenthandle.cpp

@@ -65,7 +65,7 @@
 #include "session.h"
 #include "trackerentry.h"
 
-const QString QB_EXT {".!qB"};
+const QString QB_EXT {QStringLiteral(".!qB")};
 
 namespace libt = libtorrent;
 using namespace BitTorrent;
@@ -85,16 +85,16 @@ namespace
 
 // AddTorrentData
 
-AddTorrentData::AddTorrentData()
-    : resumed(false)
+CreateTorrentParams::CreateTorrentParams()
+    : restored(false)
     , disableTempPath(false)
     , sequential(false)
     , firstLastPiecePriority(false)
     , hasSeedStatus(false)
     , skipChecking(false)
     , hasRootFolder(true)
-    , addForced(false)
-    , addPaused(false)
+    , forced(false)
+    , paused(false)
     , uploadLimit(-1)
     , downloadLimit(-1)
     , ratioLimit(TorrentHandle::USE_GLOBAL_RATIO)
@@ -102,8 +102,8 @@ AddTorrentData::AddTorrentData()
 {
 }
 
-AddTorrentData::AddTorrentData(const AddTorrentParams &params)
-    : resumed(false)
+CreateTorrentParams::CreateTorrentParams(const AddTorrentParams &params)
+    : restored(false)
     , name(params.name)
     , category(params.category)
     , tags(params.tags)
@@ -116,8 +116,8 @@ AddTorrentData::AddTorrentData(const AddTorrentParams &params)
     , hasRootFolder(params.createSubfolder == TriStateBool::Undefined
                     ? Session::instance()->isCreateTorrentSubfolder()
                     : params.createSubfolder == TriStateBool::True)
-    , addForced(params.addForced == TriStateBool::True)
-    , addPaused(params.addPaused == TriStateBool::Undefined
+    , forced(params.addForced == TriStateBool::True)
+    , paused(params.addPaused == TriStateBool::Undefined
                 ? Session::instance()->isAddTorrentPaused()
                 : params.addPaused == TriStateBool::True)
     , uploadLimit(params.uploadLimit)
@@ -172,26 +172,25 @@ namespace
 }
 
 TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle &nativeHandle,
-                                     const AddTorrentData &data)
+                                     const CreateTorrentParams &params)
     : QObject(session)
     , m_session(session)
     , m_nativeHandle(nativeHandle)
     , m_state(TorrentState::Unknown)
     , m_renameCount(0)
-    , m_useAutoTMM(data.savePath.isEmpty())
-    , m_name(data.name)
-    , m_savePath(Utils::Fs::toNativePath(data.savePath))
-    , m_category(data.category)
-    , m_tags(data.tags)
-    , m_hasSeedStatus(data.hasSeedStatus)
-    , m_ratioLimit(data.ratioLimit)
-    , m_seedingTimeLimit(data.seedingTimeLimit)
-    , m_tempPathDisabled(data.disableTempPath)
+    , m_useAutoTMM(params.savePath.isEmpty())
+    , m_name(params.name)
+    , m_savePath(Utils::Fs::toNativePath(params.savePath))
+    , m_category(params.category)
+    , m_tags(params.tags)
+    , m_hasSeedStatus(params.hasSeedStatus)
+    , m_ratioLimit(params.ratioLimit)
+    , m_seedingTimeLimit(params.seedingTimeLimit)
+    , m_tempPathDisabled(params.disableTempPath)
     , m_hasMissingFiles(false)
-    , m_hasRootFolder(data.hasRootFolder)
+    , m_hasRootFolder(params.hasRootFolder)
     , m_needsToSetFirstLastPiecePriority(false)
     , m_pauseAfterRecheck(false)
-    , m_needSaveResumeData(false)
 {
     if (m_useAutoTMM)
         m_savePath = Utils::Fs::toNativePath(m_session->categorySavePath(m_category));
@@ -207,15 +206,29 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
     // download sequentially or have first/last piece priority enabled when
     // its resume data was saved. These two settings are restored later. But
     // if we set them to false now, both will erroneously not be restored.
-    if (!data.resumed || data.sequential)
-        setSequentialDownload(data.sequential);
-    if (!data.resumed || data.firstLastPiecePriority)
-        setFirstLastPiecePriority(data.firstLastPiecePriority);
+    if (!params.restored || params.sequential)
+        setSequentialDownload(params.sequential);
+    if (!params.restored || params.firstLastPiecePriority)
+        setFirstLastPiecePriority(params.firstLastPiecePriority);
 
-    if (!data.resumed && hasMetadata()) {
+    if (!params.restored && hasMetadata()) {
         if (filesCount() == 1)
             m_hasRootFolder = false;
     }
+
+    // "started" means "all initialization has completed and torrent has started regular processing".
+    // When torrent added/restored in "paused" state it become "started" immediately after construction.
+    // When it is added/restored in "resumed" state, it become "started" after it is really resumed
+    // (i.e. after receiving "torrent resumed" alert).
+    m_started = (params.restored && hasMetadata() ? isPaused() : params.paused);
+
+    if (!m_started) {
+        if (!params.restored || !hasMetadata()) {
+            // Resume torrent because it was added in "resumed" state
+            // but it's actually paused during initialization
+            resume(params.forced);
+        }
+    }
 }
 
 TorrentHandle::~TorrentHandle() {}
@@ -315,7 +328,7 @@ QString TorrentHandle::rootPath(bool actual) const
         return QString();
 
     QString firstFilePath = filePath(0);
-    const int slashIndex = firstFilePath.indexOf("/");
+    const int slashIndex = firstFilePath.indexOf('/');
     if (slashIndex >= 0)
         return QDir(savePath(actual)).absoluteFilePath(firstFilePath.left(slashIndex));
     else
@@ -488,8 +501,6 @@ bool TorrentHandle::connectPeer(const PeerAddress &peerAddress)
 
 bool TorrentHandle::needSaveResumeData() const
 {
-    if (m_needSaveResumeData) return true;
-
     return m_nativeHandle.need_save_resume_data();
 }
 
@@ -499,7 +510,6 @@ void TorrentHandle::saveResumeData(bool updateStatus)
         this->updateStatus();
 
     m_nativeHandle.save_resume_data();
-    m_needSaveResumeData = false;
 }
 
 int TorrentHandle::filesCount() const
@@ -519,15 +529,19 @@ int TorrentHandle::piecesHave() const
 
 qreal TorrentHandle::progress() const
 {
-    if (!m_nativeStatus.total_wanted)
-        return 0.;
+    if (!isChecking()) {
+        if (!m_nativeStatus.total_wanted)
+            return 0.;
 
-    if (m_nativeStatus.total_wanted_done == m_nativeStatus.total_wanted)
-        return 1.;
+        if (m_nativeStatus.total_wanted_done == m_nativeStatus.total_wanted)
+            return 1.;
 
-    float progress = static_cast<float>(m_nativeStatus.total_wanted_done) / m_nativeStatus.total_wanted;
-    Q_ASSERT((progress >= 0.f) && (progress <= 1.f));
-    return progress;
+        qreal progress = static_cast<qreal>(m_nativeStatus.total_wanted_done) / m_nativeStatus.total_wanted;
+        Q_ASSERT((progress >= 0.f) && (progress <= 1.f));
+        return progress;
+    }
+
+    return m_nativeStatus.progress;
 }
 
 QString TorrentHandle::category() const
@@ -542,7 +556,7 @@ bool TorrentHandle::belongsToCategory(const QString &category) const
 
     if (m_category == category) return true;
 
-    if (m_session->isSubcategoriesEnabled() && m_category.startsWith(category + "/"))
+    if (m_session->isSubcategoriesEnabled() && m_category.startsWith(category + '/'))
         return true;
 
     return false;
@@ -569,7 +583,6 @@ bool TorrentHandle::addTag(const QString &tag)
                 return false;
         m_tags.insert(tag);
         m_session->handleTorrentTagAdded(this, tag);
-        m_needSaveResumeData = true;
         return true;
     }
     return false;
@@ -579,7 +592,6 @@ bool TorrentHandle::removeTag(const QString &tag)
 {
     if (m_tags.remove(tag)) {
         m_session->handleTorrentTagRemoved(this, tag);
-        m_needSaveResumeData = true;
         return true;
     }
     return false;
@@ -734,7 +746,8 @@ bool TorrentHandle::isActive() const
             || m_state == TorrentState::Downloading
             || m_state == TorrentState::ForcedDownloading
             || m_state == TorrentState::Uploading
-            || m_state == TorrentState::ForcedUploading;
+            || m_state == TorrentState::ForcedUploading
+            || m_state == TorrentState::Moving;
 }
 
 bool TorrentHandle::isInactive() const
@@ -776,28 +789,18 @@ bool TorrentHandle::hasFirstLastPiecePriority() const
     if (!hasMetadata())
         return m_needsToSetFirstLastPiecePriority;
 
-    // Get int first media file
-    std::vector<int> fp;
-    fp = m_nativeHandle.file_priorities();
+    const std::vector<int> filePriorities = nativeHandle().file_priorities();
+    for (int i = 0; i < static_cast<int>(filePriorities.size()); ++i) {
+        if (filePriorities[i] <= 0)
+            continue;
 
-    TorrentInfo::PieceRange extremities;
-    bool found = false;
-    int count = static_cast<int>(fp.size());
-    for (int i = 0; i < count; ++i) {
-        const QString ext = Utils::Fs::fileExtension(filePath(i));
-        if (Utils::Misc::isPreviewable(ext) && (fp[i] > 0)) {
-            extremities = info().filePieces(i);
-            found = true;
-            break;
-        }
+        const TorrentInfo::PieceRange extremities = info().filePieces(i);
+        const int firstPiecePrio = nativeHandle().piece_priority(extremities.first());
+        const int lastPiecePrio = nativeHandle().piece_priority(extremities.last());
+        return ((firstPiecePrio == 7) && (lastPiecePrio == 7));
     }
 
-    if (!found) return false; // No media file
-
-    int first = m_nativeHandle.piece_priority(extremities.first());
-    int last = m_nativeHandle.piece_priority(extremities.last());
-
-    return ((first == 7) && (last == 7));
+    return false;
 }
 
 TorrentState TorrentHandle::state() const
@@ -807,7 +810,10 @@ TorrentState TorrentHandle::state() const
 
 void TorrentHandle::updateState()
 {
-    if (isPaused()) {
+    if (isMoveInProgress()) {
+        m_state = TorrentState::Moving;
+    }
+    else if (isPaused()) {
         if (hasMissingFiles())
             m_state = TorrentState::MissingFiles;
         else if (hasError())
@@ -1200,7 +1206,7 @@ void TorrentHandle::setName(const QString &name)
 {
     if (m_name != name) {
         m_name = name;
-        m_needSaveResumeData = true;
+        m_session->handleTorrentNameChanged(this);
     }
 }
 
@@ -1216,7 +1222,6 @@ bool TorrentHandle::setCategory(const QString &category)
 
         QString oldCategory = m_category;
         m_category = category;
-        m_needSaveResumeData = true;
         m_session->handleTorrentCategoryChanged(this, oldCategory);
 
         if (m_useAutoTMM) {
@@ -1254,7 +1259,6 @@ void TorrentHandle::move_impl(QString path, bool overwrite)
     }
     else {
         m_savePath = path;
-        m_needSaveResumeData = true;
         m_session->handleTorrentSavePathChanged(this);
     }
 }
@@ -1275,7 +1279,7 @@ void TorrentHandle::forceRecheck()
 
     if (isPaused()) {
         m_pauseAfterRecheck = true;
-        resume();
+        resume_impl(true, true);
     }
 
     m_nativeHandle.force_recheck();
@@ -1294,39 +1298,45 @@ void TorrentHandle::toggleSequentialDownload()
     setSequentialDownload(!isSequentialDownload());
 }
 
-void TorrentHandle::setFirstLastPiecePriority(bool b)
+void TorrentHandle::setFirstLastPiecePriority(const bool enabled)
 {
+    setFirstLastPiecePriorityImpl(enabled);
+}
+
+void TorrentHandle::setFirstLastPiecePriorityImpl(const bool enabled, const QVector<int> &updatedFilePrio)
+{
+    // Download first and last pieces first for every file in the torrent
+
     if (!hasMetadata()) {
-        m_needsToSetFirstLastPiecePriority = b;
+        m_needsToSetFirstLastPiecePriority = enabled;
         return;
     }
 
-    std::vector<int> fp = m_nativeHandle.file_priorities();
-    std::vector<int> pp = m_nativeHandle.piece_priorities();
+    // Updating file priorities is an async operation in libtorrent, when we just updated it and immediately query it
+    // we might get the old/wrong values, so we rely on `updatedFilePrio` in this case.
+    const std::vector<int> filePriorities = !updatedFilePrio.isEmpty() ? updatedFilePrio.toStdVector() : nativeHandle().file_priorities();
+    std::vector<int> piecePriorities = nativeHandle().piece_priorities();
+    for (int index = 0; index < static_cast<int>(filePriorities.size()); ++index) {
+        const int filePrio = filePriorities[index];
+        if (filePrio <= 0)
+            continue;
 
-    // Download first and last pieces first for all media files in the torrent
-    int nbfiles = static_cast<int>(fp.size());
-    for (int index = 0; index < nbfiles; ++index) {
-        const QString path = filePath(index);
-        const QString ext = Utils::Fs::fileExtension(path);
-        if (Utils::Misc::isPreviewable(ext) && (fp[index] > 0)) {
-            qDebug() << "File" << path << "is previewable, toggle downloading of first/last pieces first";
+        // Determine the priority to set
+        const int newPrio = enabled ? 7 : filePrio;
+        const TorrentInfo::PieceRange extremities = info().filePieces(index);
 
-            // Determine the priority to set
-            int prio = b ? 7 : fp[index];
-
-            TorrentInfo::PieceRange extremities = info().filePieces(index);
-
-            // worst case: AVI index = 1% of total file size (at the end of the file)
-            int nNumPieces = ceil(fileSize(index) * 0.01 / pieceLength());
-            for (int i = 0; i < nNumPieces; ++i) {
-                pp[extremities.first() + i] = prio;
-                pp[extremities.last() - i] = prio;
-            }
+        // worst case: AVI index = 1% of total file size (at the end of the file)
+        const int nNumPieces = std::ceil(fileSize(index) * 0.01 / pieceLength());
+        for (int i = 0; i < nNumPieces; ++i) {
+            piecePriorities[extremities.first() + i] = newPrio;
+            piecePriorities[extremities.last() - i] = newPrio;
         }
     }
 
-    m_nativeHandle.prioritize_pieces(pp);
+    m_nativeHandle.prioritize_pieces(piecePriorities);
+
+    LogMsg(tr("Download first and last piece first: %1, torrent: '%2'")
+        .arg((enabled ? tr("On") : tr("Off")), name()));
 }
 
 void TorrentHandle::toggleFirstLastPiecePriority()
@@ -1343,12 +1353,17 @@ void TorrentHandle::pause()
 }
 
 void TorrentHandle::resume(bool forced)
+{
+    resume_impl(forced, false);
+}
+
+void TorrentHandle::resume_impl(bool forced, bool uploadMode)
 {
     if (hasError())
         m_nativeHandle.clear_error();
     m_hasMissingFiles = false;
-    m_nativeHandle.set_upload_mode(false);
     m_nativeHandle.auto_managed(!forced);
+    m_nativeHandle.set_upload_mode(uploadMode);
     m_nativeHandle.resume();
 }
 
@@ -1369,6 +1384,7 @@ void TorrentHandle::moveStorage(const QString &newPath, bool overwrite)
                                     , (overwrite ? libt::always_replace_files : libt::dont_replace));
         m_moveStorageInfo.oldPath = oldPath;
         m_moveStorageInfo.newPath = newPath;
+        updateState();
     }
 }
 
@@ -1418,7 +1434,7 @@ void TorrentHandle::handleStateUpdate(const libt::torrent_status &nativeStatus)
     updateStatus(nativeStatus);
 }
 
-void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
+void TorrentHandle::handleStorageMovedAlert(const libtorrent::storage_moved_alert *p)
 {
     if (!isMoveInProgress()) {
         qWarning() << "Unexpected " << Q_FUNC_INFO << " call.";
@@ -1435,8 +1451,8 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
         return;
     }
 
-    qDebug("Torrent is successfully moved from %s to %s"
-        , qUtf8Printable(m_moveStorageInfo.oldPath), qUtf8Printable(m_moveStorageInfo.newPath));
+    LogMsg(tr("Successfully moved torrent: %1. New path: %2").arg(name(), m_moveStorageInfo.newPath));
+
     const QDir oldDir {m_moveStorageInfo.oldPath};
     if ((oldDir == QDir(m_session->torrentTempPath(info())))
             && (oldDir != QDir(m_session->tempPath()))) {
@@ -1445,9 +1461,10 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
         qDebug() << "Removing torrent temp folder:" << m_moveStorageInfo.oldPath;
         Utils::Fs::smartRemoveEmptyFolderTree(m_moveStorageInfo.oldPath);
     }
-    updateStatus();
 
     m_moveStorageInfo.newPath.clear();
+    updateStatus();
+
     if (!m_moveStorageInfo.queuedPath.isEmpty()) {
         moveStorage(m_moveStorageInfo.queuedPath, m_moveStorageInfo.queuedOverwrite);
         m_moveStorageInfo.queuedPath.clear();
@@ -1462,17 +1479,19 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
         m_moveFinishedTriggers.takeFirst()();
 }
 
-void TorrentHandle::handleStorageMovedFailedAlert(libtorrent::storage_moved_failed_alert *p)
+void TorrentHandle::handleStorageMovedFailedAlert(const libtorrent::storage_moved_failed_alert *p)
 {
     if (!isMoveInProgress()) {
         qWarning() << "Unexpected " << Q_FUNC_INFO << " call.";
         return;
     }
 
-    Logger::instance()->addMessage(tr("Could not move torrent: '%1'. Reason: %2")
-                                   .arg(name()).arg(QString::fromStdString(p->message())), Log::CRITICAL);
+    LogMsg(tr("Could not move torrent: '%1'. Reason: %2")
+        .arg(name(), QString::fromStdString(p->message())), Log::CRITICAL);
 
     m_moveStorageInfo.newPath.clear();
+    updateStatus();
+
     if (!m_moveStorageInfo.queuedPath.isEmpty()) {
         moveStorage(m_moveStorageInfo.queuedPath, m_moveStorageInfo.queuedOverwrite);
         m_moveStorageInfo.queuedPath.clear();
@@ -1482,7 +1501,7 @@ void TorrentHandle::handleStorageMovedFailedAlert(libtorrent::storage_moved_fail
         m_moveFinishedTriggers.takeFirst()();
 }
 
-void TorrentHandle::handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p)
+void TorrentHandle::handleTrackerReplyAlert(const libtorrent::tracker_reply_alert *p)
 {
 #if LIBTORRENT_VERSION_NUM < 10100
     QString trackerUrl = QString::fromStdString(p->url);
@@ -1497,32 +1516,32 @@ void TorrentHandle::handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p)
     m_session->handleTorrentTrackerReply(this, trackerUrl);
 }
 
-void TorrentHandle::handleTrackerWarningAlert(libtorrent::tracker_warning_alert *p)
+void TorrentHandle::handleTrackerWarningAlert(const libtorrent::tracker_warning_alert *p)
 {
 #if LIBTORRENT_VERSION_NUM < 10100
-    QString trackerUrl = QString::fromStdString(p->url);
-    QString message = QString::fromStdString(p->msg);
+    const QString trackerUrl = QString::fromStdString(p->url);
+    const QString message = QString::fromStdString(p->msg);
 #else
-    QString trackerUrl(p->tracker_url());
-    QString message = QString::fromStdString(p->message());
+    const QString trackerUrl = p->tracker_url();
+    const QString message = p->warning_message();
 #endif
-    qDebug("Received a tracker warning for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message));
+
     // Connection was successful now but there is a warning message
     m_trackerInfos[trackerUrl].lastMessage = message; // Store warning message
 
     m_session->handleTorrentTrackerWarning(this, trackerUrl);
 }
 
-void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p)
+void TorrentHandle::handleTrackerErrorAlert(const libtorrent::tracker_error_alert *p)
 {
 #if LIBTORRENT_VERSION_NUM < 10100
-    QString trackerUrl = QString::fromStdString(p->url);
-    QString message = QString::fromStdString(p->msg);
+    const QString trackerUrl = QString::fromStdString(p->url);
+    const QString message = QString::fromStdString(p->msg);
 #else
-    QString trackerUrl(p->tracker_url());
-    QString message = QString::fromStdString(p->message());
+    const QString trackerUrl = p->tracker_url();
+    const QString message = p->error_message();
 #endif
-    qDebug("Received a tracker error for %s: %s", qUtf8Printable(trackerUrl), qUtf8Printable(message));
+
     m_trackerInfos[trackerUrl].lastMessage = message;
 
     if (p->status_code == 401)
@@ -1531,7 +1550,7 @@ void TorrentHandle::handleTrackerErrorAlert(libtorrent::tracker_error_alert *p)
     m_session->handleTorrentTrackerError(this, trackerUrl);
 }
 
-void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p)
+void TorrentHandle::handleTorrentCheckedAlert(const libtorrent::torrent_checked_alert *p)
 {
     Q_UNUSED(p);
     qDebug("%s have just finished checking", qUtf8Printable(hash()));
@@ -1554,7 +1573,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert
     m_session->handleTorrentChecked(this);
 }
 
-void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p)
+void TorrentHandle::handleTorrentFinishedAlert(const libtorrent::torrent_finished_alert *p)
 {
     Q_UNUSED(p);
     qDebug("Got a torrent finished alert for %s", qUtf8Printable(name()));
@@ -1581,7 +1600,7 @@ void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_aler
     }
 }
 
-void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p)
+void TorrentHandle::handleTorrentPausedAlert(const libtorrent::torrent_paused_alert *p)
 {
     Q_UNUSED(p);
     updateStatus();
@@ -1589,13 +1608,17 @@ void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p
     m_session->handleTorrentPaused(this);
 }
 
-void TorrentHandle::handleTorrentResumedAlert(libtorrent::torrent_resumed_alert *p)
+void TorrentHandle::handleTorrentResumedAlert(const libtorrent::torrent_resumed_alert *p)
 {
     Q_UNUSED(p);
-    m_session->handleTorrentResumed(this);
+
+    if (m_started)
+        m_session->handleTorrentResumed(this);
+    else
+        m_started = true;
 }
 
-void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert *p)
+void TorrentHandle::handleSaveResumeDataAlert(const libtorrent::save_resume_data_alert *p)
 {
     const bool useDummyResumeData = !(p && p->resume_data);
     libtorrent::entry dummyEntry;
@@ -1629,36 +1652,35 @@ void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert
     m_session->handleTorrentResumeDataReady(this, resumeData);
 }
 
-void TorrentHandle::handleSaveResumeDataFailedAlert(libtorrent::save_resume_data_failed_alert *p)
+void TorrentHandle::handleSaveResumeDataFailedAlert(const libtorrent::save_resume_data_failed_alert *p)
 {
     // if torrent has no metadata we should save dummy fastresume data
     // containing Magnet URI and qBittorrent own resume data only
     if (p->error.value() == libt::errors::no_metadata)
-        handleSaveResumeDataAlert(0);
+        handleSaveResumeDataAlert(nullptr);
     else
         m_session->handleTorrentResumeDataFailed(this);
 }
 
-void TorrentHandle::handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p)
+void TorrentHandle::handleFastResumeRejectedAlert(const libtorrent::fastresume_rejected_alert *p)
 {
     qDebug("/!\\ Fast resume failed for %s, reason: %s", qUtf8Printable(name()), p->message().c_str());
-    Logger *const logger = Logger::instance();
 
     updateStatus();
     if (p->error.value() == libt::errors::mismatching_file_size) {
         // Mismatching file size (files were probably moved)
-        logger->addMessage(tr("File sizes mismatch for torrent '%1', pausing it.").arg(name()), Log::CRITICAL);
+        LogMsg(tr("File sizes mismatch for torrent '%1', pausing it.").arg(name()), Log::CRITICAL);
         m_hasMissingFiles = true;
         if (!isPaused())
             pause();
     }
     else {
-        logger->addMessage(tr("Fast resume data was rejected for torrent '%1'. Reason: %2. Checking again...")
-                           .arg(name()).arg(QString::fromStdString(p->message())), Log::CRITICAL);
+        LogMsg(tr("Fast resume data was rejected for torrent '%1'. Reason: %2. Checking again...")
+            .arg(name(), QString::fromStdString(p->message())), Log::CRITICAL);
     }
 }
 
-void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p)
+void TorrentHandle::handleFileRenamedAlert(const libtorrent::file_renamed_alert *p)
 {
 #if LIBTORRENT_VERSION_NUM < 10100
     QString newName = Utils::Fs::fromNativePath(QString::fromStdString(p->name));
@@ -1669,15 +1691,15 @@ void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p)
     // TODO: Check this!
     if (filesCount() > 1) {
         // Check if folders were renamed
-        QStringList oldPathParts = m_torrentInfo.origFilePath(p->index).split("/");
+        QStringList oldPathParts = m_torrentInfo.origFilePath(p->index).split('/');
         oldPathParts.removeLast();
-        QString oldPath = oldPathParts.join("/");
-        QStringList newPathParts = newName.split("/");
+        QString oldPath = oldPathParts.join('/');
+        QStringList newPathParts = newName.split('/');
         newPathParts.removeLast();
-        QString newPath = newPathParts.join("/");
+        QString newPath = newPathParts.join('/');
         if (!newPathParts.isEmpty() && (oldPath != newPath)) {
             qDebug("oldPath(%s) != newPath(%s)", qUtf8Printable(oldPath), qUtf8Printable(newPath));
-            oldPath = QString("%1/%2").arg(savePath(true)).arg(oldPath);
+            oldPath = QString("%1/%2").arg(savePath(true), oldPath);
             qDebug("Detected folder renaming, attempt to delete old folder: %s", qUtf8Printable(oldPath));
             QDir().rmpath(oldPath);
         }
@@ -1690,7 +1712,7 @@ void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p)
         m_moveFinishedTriggers.takeFirst()();
 }
 
-void TorrentHandle::handleFileRenameFailedAlert(libtorrent::file_rename_failed_alert *p)
+void TorrentHandle::handleFileRenameFailedAlert(const libtorrent::file_rename_failed_alert *p)
 {
     Q_UNUSED(p);
 
@@ -1699,7 +1721,7 @@ void TorrentHandle::handleFileRenameFailedAlert(libtorrent::file_rename_failed_a
         m_moveFinishedTriggers.takeFirst()();
 }
 
-void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p)
+void TorrentHandle::handleFileCompletedAlert(const libtorrent::file_completed_alert *p)
 {
     updateStatus();
 
@@ -1715,7 +1737,7 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p
     }
 }
 
-void TorrentHandle::handleStatsAlert(libtorrent::stats_alert *p)
+void TorrentHandle::handleStatsAlert(const libtorrent::stats_alert *p)
 {
     Q_ASSERT(p->interval >= 1000);
     SpeedSample transferred(p->transferred[libt::stats_alert::download_payload] * 1000LL / p->interval,
@@ -1723,7 +1745,7 @@ void TorrentHandle::handleStatsAlert(libtorrent::stats_alert *p)
     m_speedMonitor.addSample(transferred);
 }
 
-void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p)
+void TorrentHandle::handleMetadataReceivedAlert(const libt::metadata_received_alert *p)
 {
     Q_UNUSED(p);
     qDebug("Metadata received for torrent %s.", qUtf8Printable(name()));
@@ -1802,6 +1824,9 @@ void TorrentHandle::handleAlert(libtorrent::alert *a)
     case libt::torrent_paused_alert::alert_type:
         handleTorrentPausedAlert(static_cast<libt::torrent_paused_alert*>(a));
         break;
+    case libt::torrent_resumed_alert::alert_type:
+        handleTorrentResumedAlert(static_cast<libt::torrent_resumed_alert*>(a));
+        break;
     case libt::tracker_error_alert::alert_type:
         handleTrackerErrorAlert(static_cast<libt::tracker_error_alert*>(a));
         break;
@@ -1827,7 +1852,7 @@ void TorrentHandle::manageIncompleteFiles()
 {
     const bool isAppendExtensionEnabled = m_session->isAppendExtensionEnabled();
     QVector<qreal> fp = filesProgress();
-    if( fp.size() != filesCount() ) {
+    if (fp.size() != filesCount()) {
         qDebug() << "skip manageIncompleteFiles because of invalid torrent meta-data or empty file-progress";
         return;
     }
@@ -1924,7 +1949,6 @@ void TorrentHandle::setRatioLimit(qreal limit)
 
     if (m_ratioLimit != limit) {
         m_ratioLimit = limit;
-        m_needSaveResumeData = true;
         m_session->handleTorrentShareLimitChanged(this);
     }
 }
@@ -1938,7 +1962,6 @@ void TorrentHandle::setSeedingTimeLimit(int limit)
 
     if (m_seedingTimeLimit != limit) {
         m_seedingTimeLimit = limit;
-        m_needSaveResumeData = true;
         m_session->handleTorrentShareLimitChanged(this);
     }
 }
@@ -1976,7 +1999,7 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
     if (priorities.size() != filesCount()) return;
 
     // Save first/last piece first option state
-    bool firstLastPieceFirst = hasFirstLastPiecePriority();
+    const bool firstLastPieceFirst = hasFirstLastPiecePriority();
 
     // Reset 'm_hasSeedStatus' if needed in order to react again to
     // 'torrent_finished_alert' and eg show tray notifications
@@ -2003,7 +2026,7 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
             // Make sure the file does not already exists
             if (QDir(parentAbsPath).dirName() != ".unwanted") {
                 QString unwantedAbsPath = parentAbsPath + "/.unwanted";
-                QString newAbsPath = unwantedAbsPath + "/" + Utils::Fs::fileName(filepath);
+                QString newAbsPath = unwantedAbsPath + '/' + Utils::Fs::fileName(filepath);
                 qDebug() << "Unwanted path is" << unwantedAbsPath;
                 if (QFile::exists(newAbsPath)) {
                     qWarning() << "File" << newAbsPath << "already exists at destination.";
@@ -2023,8 +2046,8 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
                 }
 #endif
                 QString parentPath = Utils::Fs::branchPath(filepath);
-                if (!parentPath.isEmpty() && !parentPath.endsWith("/"))
-                    parentPath += "/";
+                if (!parentPath.isEmpty() && !parentPath.endsWith('/'))
+                    parentPath += '/';
                 renameFile(i, parentPath + ".unwanted/" + Utils::Fs::fileName(filepath));
             }
         }
@@ -2041,15 +2064,15 @@ void TorrentHandle::prioritizeFiles(const QVector<int> &priorities)
                     renameFile(i, QDir(newRelPath).filePath(oldName));
 
                 // Remove .unwanted directory if empty
-                qDebug() << "Attempting to remove .unwanted folder at " << QDir(spath + "/" + newRelPath).absoluteFilePath(".unwanted");
-                QDir(spath + "/" + newRelPath).rmdir(".unwanted");
+                qDebug() << "Attempting to remove .unwanted folder at " << QDir(spath + '/' + newRelPath).absoluteFilePath(".unwanted");
+                QDir(spath + '/' + newRelPath).rmdir(".unwanted");
             }
         }
     }
 
     // Restore first/last piece first option if necessary
     if (firstLastPieceFirst)
-        setFirstLastPiecePriority(true);
+        setFirstLastPiecePriorityImpl(true, priorities);
 
     updateStatus();
 }

src/base/bittorrent/torrenthandle.h

@@ -88,10 +88,10 @@ namespace BitTorrent
     class TrackerEntry;
     struct AddTorrentParams;
 
-    struct AddTorrentData
+    struct CreateTorrentParams
     {
-        bool resumed;
-        // for both new and resumed torrents
+        bool restored; // is existing torrent job?
+        // for both new and restored torrents
         QString name;
         QString category;
         QSet<QString> tags;
@@ -102,18 +102,18 @@ namespace BitTorrent
         bool hasSeedStatus;
         bool skipChecking;
         bool hasRootFolder;
-        bool addForced;
-        bool addPaused;
+        bool forced;
+        bool paused;
         int uploadLimit;
         int downloadLimit;
         // for new torrents
         QVector<int> filePriorities;
-        // for resumed torrents
+        // for restored torrents
         qreal ratioLimit;
         int seedingTimeLimit;
 
-        AddTorrentData();
-        AddTorrentData(const AddTorrentParams &params);
+        CreateTorrentParams();
+        CreateTorrentParams(const AddTorrentParams &params);
     };
 
     struct TrackerInfo
@@ -149,6 +149,8 @@ namespace BitTorrent
         PausedDownloading,
         PausedUploading,
 
+        Moving,
+
         MissingFiles,
         Error
     };
@@ -168,7 +170,7 @@ namespace BitTorrent
         static const int MAX_SEEDING_TIME;
 
         TorrentHandle(Session *session, const libtorrent::torrent_handle &nativeHandle,
-                          const AddTorrentData &data);
+                          const CreateTorrentParams &params);
         ~TorrentHandle();
 
         bool isValid() const;
@@ -331,7 +333,7 @@ namespace BitTorrent
         void setName(const QString &name);
         void setSequentialDownload(bool b);
         void toggleSequentialDownload();
-        void setFirstLastPiecePriority(bool b);
+        void setFirstLastPiecePriority(bool enabled);
         void toggleFirstLastPiecePriority();
         void pause();
         void resume(bool forced = false);
@@ -388,24 +390,25 @@ namespace BitTorrent
         void updateState();
         void updateTorrentInfo();
 
-        void handleStorageMovedAlert(libtorrent::storage_moved_alert *p);
-        void handleStorageMovedFailedAlert(libtorrent::storage_moved_failed_alert *p);
-        void handleTrackerReplyAlert(libtorrent::tracker_reply_alert *p);
-        void handleTrackerWarningAlert(libtorrent::tracker_warning_alert *p);
-        void handleTrackerErrorAlert(libtorrent::tracker_error_alert *p);
-        void handleTorrentCheckedAlert(libtorrent::torrent_checked_alert *p);
-        void handleTorrentFinishedAlert(libtorrent::torrent_finished_alert *p);
-        void handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p);
-        void handleTorrentResumedAlert(libtorrent::torrent_resumed_alert *p);
-        void handleSaveResumeDataAlert(libtorrent::save_resume_data_alert *p);
-        void handleSaveResumeDataFailedAlert(libtorrent::save_resume_data_failed_alert *p);
-        void handleFastResumeRejectedAlert(libtorrent::fastresume_rejected_alert *p);
-        void handleFileRenamedAlert(libtorrent::file_renamed_alert *p);
-        void handleFileRenameFailedAlert(libtorrent::file_rename_failed_alert *p);
-        void handleFileCompletedAlert(libtorrent::file_completed_alert *p);
-        void handleMetadataReceivedAlert(libtorrent::metadata_received_alert *p);
-        void handleStatsAlert(libtorrent::stats_alert *p);
+        void handleStorageMovedAlert(const libtorrent::storage_moved_alert *p);
+        void handleStorageMovedFailedAlert(const libtorrent::storage_moved_failed_alert *p);
+        void handleTrackerReplyAlert(const libtorrent::tracker_reply_alert *p);
+        void handleTrackerWarningAlert(const libtorrent::tracker_warning_alert *p);
+        void handleTrackerErrorAlert(const libtorrent::tracker_error_alert *p);
+        void handleTorrentCheckedAlert(const libtorrent::torrent_checked_alert *p);
+        void handleTorrentFinishedAlert(const libtorrent::torrent_finished_alert *p);
+        void handleTorrentPausedAlert(const libtorrent::torrent_paused_alert *p);
+        void handleTorrentResumedAlert(const libtorrent::torrent_resumed_alert *p);
+        void handleSaveResumeDataAlert(const libtorrent::save_resume_data_alert *p);
+        void handleSaveResumeDataFailedAlert(const libtorrent::save_resume_data_failed_alert *p);
+        void handleFastResumeRejectedAlert(const libtorrent::fastresume_rejected_alert *p);
+        void handleFileRenamedAlert(const libtorrent::file_renamed_alert *p);
+        void handleFileRenameFailedAlert(const libtorrent::file_rename_failed_alert *p);
+        void handleFileCompletedAlert(const libtorrent::file_completed_alert *p);
+        void handleMetadataReceivedAlert(const libtorrent::metadata_received_alert *p);
+        void handleStatsAlert(const libtorrent::stats_alert *p);
 
+        void resume_impl(bool forced, bool uploadMode);
         bool isMoveInProgress() const;
         QString nativeActualSavePath() const;
 
@@ -417,6 +420,7 @@ namespace BitTorrent
         bool addTracker(const TrackerEntry &tracker);
         bool addUrlSeed(const QUrl &urlSeed);
         bool removeUrlSeed(const QUrl &urlSeed);
+        void setFirstLastPiecePriorityImpl(bool enabled, const QVector<int> &updatedFilePrio = {});
 
         Session *const m_session;
         libtorrent::torrent_handle m_nativeHandle;
@@ -458,8 +462,9 @@ namespace BitTorrent
         bool m_needsToSetFirstLastPiecePriority;
 
         bool m_pauseAfterRecheck;
-        bool m_needSaveResumeData;
         QHash<QString, TrackerInfo> m_trackerInfos;
+
+        bool m_started = false;
     };
 }
 

src/base/bittorrent/torrentinfo.cpp

@@ -26,20 +26,20 @@
  * exception statement from your version.
  */
 
-#include <QDebug>
-#include <QString>
-#include <QList>
-#include <QUrl>
-#include <QDateTime>
+#include "torrentinfo.h"
 
 #include <libtorrent/error_code.hpp>
 
-#include "base/utils/misc.h"
+#include <QDateTime>
+#include <QDebug>
+#include <QString>
+#include <QUrl>
+
 #include "base/utils/fs.h"
+#include "base/utils/misc.h"
 #include "base/utils/string.h"
 #include "infohash.h"
 #include "trackerentry.h"
-#include "torrentinfo.h"
 
 namespace libt = libtorrent;
 using namespace BitTorrent;
@@ -60,23 +60,76 @@ TorrentInfo &TorrentInfo::operator=(const TorrentInfo &other)
     return *this;
 }
 
-TorrentInfo TorrentInfo::loadFromFile(const QString &path, QString &error)
+TorrentInfo TorrentInfo::load(const QByteArray &data, QString *error) noexcept
 {
-    error.clear();
+    // 2-step construction to overcome default limits of `depth_limit` & `token_limit` which are
+    // used in `torrent_info()` constructor
+    const int depthLimit = 100;
+    const int tokenLimit = 10000000;
     libt::error_code ec;
-    TorrentInfo info(NativePtr(new libt::torrent_info(Utils::Fs::toNativePath(path).toStdString(), ec)));
+
+#if LIBTORRENT_VERSION_NUM < 10100
+    libt::lazy_entry node;
+    libt::lazy_bdecode(data.constData(), (data.constData() + data.size()), node, ec
+        , nullptr, depthLimit, tokenLimit);
+#else
+    libt::bdecode_node node;
+    bdecode(data.constData(), (data.constData() + data.size()), node, ec
+        , nullptr, depthLimit, tokenLimit);
+#endif
     if (ec) {
-        error = QString::fromUtf8(ec.message().c_str());
-        qDebug("Cannot load .torrent file: %s", qUtf8Printable(error));
+        if (error)
+            *error = QString::fromStdString(ec.message());
+        return TorrentInfo();
+    }
+
+    TorrentInfo info {NativePtr(new libt::torrent_info(node, ec))};
+    if (ec) {
+        if (error)
+            *error = QString::fromStdString(ec.message());
+        return TorrentInfo();
     }
 
     return info;
 }
 
-TorrentInfo TorrentInfo::loadFromFile(const QString &path)
+TorrentInfo TorrentInfo::loadFromFile(const QString &path, QString *error) noexcept
 {
-    QString error;
-    return loadFromFile(path, error);
+    if (error)
+        error->clear();
+
+    QFile file {path};
+    if (!file.open(QIODevice::ReadOnly)) {
+        if (error)
+            *error = file.errorString();
+        return TorrentInfo();
+    }
+
+    const qint64 fileSizeLimit = 100 * 1024 * 1024;  // 100 MB
+    if (file.size() > fileSizeLimit) {
+        if (error)
+            *error = tr("File size exceeds max limit %1").arg(fileSizeLimit);
+        return TorrentInfo();
+    }
+
+    QByteArray data;
+    try {
+        data = file.readAll();
+    }
+    catch (const std::bad_alloc &e) {
+        if (error)
+            *error = tr("Torrent file read error: %1").arg(e.what());
+        return TorrentInfo();
+    }
+    if (data.size() != file.size()) {
+        if (error)
+            *error = tr("Torrent file read error: size mismatch");
+        return TorrentInfo();
+    }
+
+    file.close();
+
+    return load(data, error);
 }
 
 bool TorrentInfo::isValid() const
@@ -261,7 +314,7 @@ QVector<QByteArray> TorrentInfo::pieceHashes() const
     return hashes;
 }
 
-TorrentInfo::PieceRange TorrentInfo::filePieces(const QString& file) const
+TorrentInfo::PieceRange TorrentInfo::filePieces(const QString &file) const
 {
     if (!isValid()) // if we do not check here the debug message will be printed, which would be not correct
         return {};
@@ -299,8 +352,8 @@ void TorrentInfo::renameFile(uint index, const QString &newPath)
 
 int BitTorrent::TorrentInfo::fileIndex(const QString& fileName) const
 {
-    // the check whether the object valid is not needed here
-    // because filesCount() returns -1 in that case and the loop exits immediately
+    // the check whether the object is valid is not needed here
+    // because if filesCount() returns -1 the loop exits immediately
     for (int i = 0; i < filesCount(); ++i)
         if (fileName == filePath(i))
             return i;
@@ -308,24 +361,29 @@ int BitTorrent::TorrentInfo::fileIndex(const QString& fileName) const
     return -1;
 }
 
-bool TorrentInfo::hasRootFolder() const
+QString TorrentInfo::rootFolder() const
 {
-    QString testRootFolder;
+    QString rootFolder;
     for (int i = 0; i < filesCount(); ++i) {
         const QString filePath = this->filePath(i);
         if (QDir::isAbsolutePath(filePath)) continue;
 
         const auto filePathElements = filePath.splitRef('/');
         // if at least one file has no root folder, no common root folder exists
-        if (filePathElements.count() <= 1) return false;
+        if (filePathElements.count() <= 1) return "";
 
-        if (testRootFolder.isEmpty())
-            testRootFolder = filePathElements.at(0).toString();
-        else if (testRootFolder != filePathElements.at(0))
-            return false;
+        if (rootFolder.isEmpty())
+            rootFolder = filePathElements.at(0).toString();
+        else if (rootFolder != filePathElements.at(0))
+            return "";
     }
 
-    return true;
+    return rootFolder;
+}
+
+bool TorrentInfo::hasRootFolder() const
+{
+    return !rootFolder().isEmpty();
 }
 
 void TorrentInfo::stripRootFolder()

src/base/bittorrent/torrentinfo.h

@@ -29,20 +29,21 @@
 #ifndef BITTORRENT_TORRENTINFO_H
 #define BITTORRENT_TORRENTINFO_H
 
-#include <QtGlobal>
-
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/version.hpp>
 
+#include <QCoreApplication>
+#include <QList>
+#include <QtGlobal>
+#include <QVector>
+
 #include "base/indexrange.h"
 
-class QString;
-class QUrl;
-class QDateTime;
-class QStringList;
 class QByteArray;
-template<typename T> class QList;
-template<typename T> class QVector;
+class QDateTime;
+class QString;
+class QStringList;
+class QUrl;
 
 namespace BitTorrent
 {
@@ -51,6 +52,8 @@ namespace BitTorrent
 
     class TorrentInfo
     {
+        Q_DECLARE_TR_FUNCTIONS(TorrentInfo)
+
     public:
 #if LIBTORRENT_VERSION_NUM < 10100
         typedef boost::intrusive_ptr<const libtorrent::torrent_info> NativeConstPtr;
@@ -63,8 +66,8 @@ namespace BitTorrent
         explicit TorrentInfo(NativeConstPtr nativeInfo = NativeConstPtr());
         TorrentInfo(const TorrentInfo &other);
 
-        static TorrentInfo loadFromFile(const QString &path, QString &error);
-        static TorrentInfo loadFromFile(const QString &path);
+        static TorrentInfo load(const QByteArray &data, QString *error = nullptr) noexcept;
+        static TorrentInfo loadFromFile(const QString &path, QString *error = nullptr) noexcept;
 
         TorrentInfo &operator=(const TorrentInfo &other);
 
@@ -101,6 +104,7 @@ namespace BitTorrent
 
         void renameFile(uint index, const QString &newPath);
 
+        QString rootFolder() const;
         bool hasRootFolder() const;
         void stripRootFolder();
 

src/base/bittorrent/tracker.cpp

@@ -1,5 +1,5 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
+ * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
@@ -27,15 +27,18 @@
  * exception statement from your version.
  */
 
+#include "tracker.h"
+
 #include <vector>
 
 #include <libtorrent/bencode.hpp>
 #include <libtorrent/entry.hpp>
 
+#include "base/global.h"
 #include "base/http/server.h"
 #include "base/preferences.h"
+#include "base/utils/bytearray.h"
 #include "base/utils/string.h"
-#include "tracker.h"
 
 // static limits
 static const int MAX_TORRENTS = 100;
@@ -57,7 +60,7 @@ bool Peer::operator==(const Peer &other) const
 
 QString Peer::uid() const
 {
-    return ip + ":" + QString::number(port);
+    return ip + ':' + QString::number(port);
 }
 
 libtorrent::entry Peer::toEntry(bool noPeerId) const
@@ -74,7 +77,7 @@ libtorrent::entry Peer::toEntry(bool noPeerId) const
 // Tracker
 
 Tracker::Tracker(QObject *parent)
-    : Http::ResponseBuilder(parent)
+    : QObject(parent)
     , m_server(new Http::Server(this, this))
 {
 }
@@ -130,19 +133,30 @@ Http::Response Tracker::processRequest(const Http::Request &request, const Http:
 
 void Tracker::respondToAnnounceRequest()
 {
-    const QStringMap &gets = m_request.gets;
+    QMap<QString, QByteArray> queryParams;
+    // Parse GET parameters
+    using namespace Utils::ByteArray;
+    for (const QByteArray &param : copyAsConst(splitToViews(m_request.query, "&"))) {
+        const int sepPos = param.indexOf('=');
+        if (sepPos <= 0) continue; // ignores params without name
+
+        const QString paramName {QString::fromUtf8(param.constData(), sepPos)};
+        const QByteArray paramValue {param.mid(sepPos + 1)};
+        queryParams[paramName] = paramValue;
+    }
+
     TrackerAnnounceRequest annonceReq;
 
     // IP
     annonceReq.peer.ip = m_env.clientAddress.toString();
 
     // 1. Get info_hash
-    if (!gets.contains("info_hash")) {
+    if (!queryParams.contains("info_hash")) {
         qDebug("Tracker: Missing info_hash");
         status(101, "Missing info_hash");
         return;
     }
-    annonceReq.infoHash = gets.value("info_hash");
+    annonceReq.infoHash = queryParams.value("info_hash");
     // info_hash cannot be longer than 20 bytes
     /*if (annonce_req.info_hash.toLatin1().length() > 20) {
         qDebug("Tracker: Info_hash is not 20 byte long: %s (%d)", qUtf8Printable(annonce_req.info_hash), annonce_req.info_hash.toLatin1().length());
@@ -151,12 +165,12 @@ void Tracker::respondToAnnounceRequest()
       }*/
 
     // 2. Get peer ID
-    if (!gets.contains("peer_id")) {
+    if (!queryParams.contains("peer_id")) {
         qDebug("Tracker: Missing peer_id");
         status(102, "Missing peer_id");
         return;
     }
-    annonceReq.peer.peerId = gets.value("peer_id");
+    annonceReq.peer.peerId = queryParams.value("peer_id");
     // peer_id cannot be longer than 20 bytes
     /*if (annonce_req.peer.peer_id.length() > 20) {
         qDebug("Tracker: peer_id is not 20 byte long: %s", qUtf8Printable(annonce_req.peer.peer_id));
@@ -165,14 +179,14 @@ void Tracker::respondToAnnounceRequest()
       }*/
 
     // 3. Get port
-    if (!gets.contains("port")) {
+    if (!queryParams.contains("port")) {
         qDebug("Tracker: Missing port");
         status(103, "Missing port");
         return;
     }
     bool ok = false;
-    annonceReq.peer.port = gets.value("port").toInt(&ok);
-    if (!ok || annonceReq.peer.port < 1 || annonceReq.peer.port > 65535) {
+    annonceReq.peer.port = queryParams.value("port").toInt(&ok);
+    if (!ok || (annonceReq.peer.port < 0) || (annonceReq.peer.port > 65535)) {
         qDebug("Tracker: Invalid port number (%d)", annonceReq.peer.port);
         status(103, "Missing port");
         return;
@@ -180,15 +194,15 @@ void Tracker::respondToAnnounceRequest()
 
     // 4.  Get event
     annonceReq.event = "";
-    if (gets.contains("event")) {
-        annonceReq.event = gets.value("event");
+    if (queryParams.contains("event")) {
+        annonceReq.event = queryParams.value("event");
         qDebug("Tracker: event is %s", qUtf8Printable(annonceReq.event));
     }
 
     // 5. Get numwant
     annonceReq.numwant = 50;
-    if (gets.contains("numwant")) {
-        int tmp = gets.value("numwant").toInt();
+    if (queryParams.contains("numwant")) {
+        int tmp = queryParams.value("numwant").toInt();
         if (tmp > 0) {
             qDebug("Tracker: numwant = %d", tmp);
             annonceReq.numwant = tmp;
@@ -197,37 +211,51 @@ void Tracker::respondToAnnounceRequest()
 
     // 6. no_peer_id (extension)
     annonceReq.noPeerId = false;
-    if (gets.contains("no_peer_id"))
+    if (queryParams.contains("no_peer_id"))
         annonceReq.noPeerId = true;
 
     // 7. TODO: support "compact" extension
 
     // Done parsing, now let's reply
-    if (m_torrents.contains(annonceReq.infoHash)) {
-        if (annonceReq.event == "stopped") {
-            qDebug("Tracker: Peer stopped downloading, deleting it from the list");
-            m_torrents[annonceReq.infoHash].remove(annonceReq.peer.uid());
-            return;
-        }
+    if (annonceReq.event == "stopped") {
+        unregisterPeer(annonceReq);
     }
     else {
+        registerPeer(annonceReq);
+        replyWithPeerList(annonceReq);
+    }
+}
+
+void Tracker::registerPeer(const TrackerAnnounceRequest &annonceReq)
+{
+    if (annonceReq.peer.port == 0) return;
+
+    if (!m_torrents.contains(annonceReq.infoHash)) {
         // Unknown torrent
         if (m_torrents.size() == MAX_TORRENTS) {
             // Reached max size, remove a random torrent
             m_torrents.erase(m_torrents.begin());
         }
     }
+
     // Register the user
-    PeerList peers = m_torrents.value(annonceReq.infoHash);
-    if (peers.size() == MAX_PEERS_PER_TORRENT) {
-        // Too many peers, remove a random one
-        peers.erase(peers.begin());
+    PeerList &peers = m_torrents[annonceReq.infoHash];
+    if (!peers.contains(annonceReq.peer.uid())) {
+        // Unknown peer
+        if (peers.size() == MAX_PEERS_PER_TORRENT) {
+            // Too many peers, remove a random one
+            peers.erase(peers.begin());
+        }
     }
     peers[annonceReq.peer.uid()] = annonceReq.peer;
-    m_torrents[annonceReq.infoHash] = peers;
+}
 
-    // Reply
-    replyWithPeerList(annonceReq);
+void Tracker::unregisterPeer(const TrackerAnnounceRequest &annonceReq)
+{
+    if (annonceReq.peer.port == 0) return;
+
+    if (m_torrents[annonceReq.infoHash].remove(annonceReq.peer.uid()) > 0)
+        qDebug("Tracker: Peer stopped downloading, deleting it from the list");
 }
 
 void Tracker::replyWithPeerList(const TrackerAnnounceRequest &annonceReq)
@@ -235,22 +263,18 @@ void Tracker::replyWithPeerList(const TrackerAnnounceRequest &annonceReq)
     // Prepare the entry for bencoding
     libtorrent::entry::dictionary_type replyDict;
     replyDict["interval"] = libtorrent::entry(ANNOUNCE_INTERVAL);
-    QList<Peer> peers = m_torrents.value(annonceReq.infoHash).values();
+
     libtorrent::entry::list_type peerList;
-    foreach (const Peer &p, peers) {
-        //if (p != annonce_req.peer)
+    for (const Peer &p : m_torrents.value(annonceReq.infoHash))
         peerList.push_back(p.toEntry(annonceReq.noPeerId));
-    }
     replyDict["peers"] = libtorrent::entry(peerList);
-    libtorrent::entry replyEntry(replyDict);
+
+    const libtorrent::entry replyEntry(replyDict);
     // bencode
-    std::vector<char> buf;
-    libtorrent::bencode(std::back_inserter(buf), replyEntry);
-    QByteArray reply(&buf[0], static_cast<int>(buf.size()));
+    QByteArray reply;
+    libtorrent::bencode(std::back_inserter(reply), replyEntry);
     qDebug("Tracker: reply with the following bencoded data:\n %s", reply.constData());
 
     // HTTP reply
     print(reply, Http::CONTENT_TYPE_TXT);
 }
-
-

src/base/bittorrent/tracker.h

@@ -31,6 +31,7 @@
 #define BITTORRENT_TRACKER_H
 
 #include <QHash>
+#include <QObject>
 
 #include "base/http/irequesthandler.h"
 #include "base/http/responsebuilder.h"
@@ -51,7 +52,7 @@ namespace BitTorrent
     struct Peer
     {
         QString ip;
-        QString peerId;
+        QByteArray peerId;
         int port;
 
         bool operator!=(const Peer &other) const;
@@ -62,7 +63,7 @@ namespace BitTorrent
 
     struct TrackerAnnounceRequest
     {
-        QString infoHash;
+        QByteArray infoHash;
         QString event;
         int numwant;
         Peer peer;
@@ -71,11 +72,11 @@ namespace BitTorrent
     };
 
     typedef QHash<QString, Peer> PeerList;
-    typedef QHash<QString, PeerList> TorrentList;
+    typedef QHash<QByteArray, PeerList> TorrentList;
 
     /* Basic Bittorrent tracker implementation in Qt */
     /* Following http://wiki.theory.org/BitTorrent_Tracker_Protocol */
-    class Tracker : public Http::ResponseBuilder, public Http::IRequestHandler
+    class Tracker : public QObject, public Http::IRequestHandler, private Http::ResponseBuilder
     {
         Q_OBJECT
         Q_DISABLE_COPY(Tracker)
@@ -89,6 +90,8 @@ namespace BitTorrent
 
     private:
         void respondToAnnounceRequest();
+        void registerPeer(const TrackerAnnounceRequest &annonceReq);
+        void unregisterPeer(const TrackerAnnounceRequest &annonceReq);
         void replyWithPeerList(const TrackerAnnounceRequest &annonceReq);
 
         Http::Server *m_server;

src/base/bittorrent/trackerentry.cpp

@@ -26,11 +26,12 @@
  * exception statement from your version.
  */
 
+#include "trackerentry.h"
+
 #include <QString>
 
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
-#include "trackerentry.h"
 
 using namespace BitTorrent;
 

src/base/exceptions.cpp

@@ -0,0 +1,40 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include "exceptions.h"
+
+RuntimeError::RuntimeError(const QString &message)
+    : std::runtime_error {message.toUtf8().data()}
+    , m_message {message}
+{
+}
+
+QString RuntimeError::message() const
+{
+    return m_message;
+}

src/base/exceptions.h

@@ -1,6 +1,6 @@
 /*
- * Bittorrent Client using Qt4 and libtorrent.
- * Copyright (C) 2006-2012  Ishan Arora and Christophe Dumez
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,24 +24,19 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
-#ifndef PREFJSON_H
-#define PREFJSON_H
+#pragma once
 
+#include <stdexcept>
 #include <QString>
 
-class prefjson
+class RuntimeError : public std::runtime_error
 {
-private:
-  prefjson();
-
 public:
-  static QByteArray getPreferences();
-  static void setPreferences(const QString& json);
+    explicit RuntimeError(const QString &message = "");
+    QString message() const;
 
+private:
+    const QString m_message;
 };
-
-#endif // PREFJSON_H

src/base/filesystemwatcher.cpp

@@ -1,176 +1,161 @@
-#include <QtGlobal>
-#ifndef Q_OS_WIN
-#include <QSet>
-#include <iostream>
-#include <errno.h>
-#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <string.h>
-#elif !defined Q_OS_HAIKU
-#include <sys/vfs.h>
-#endif
-#endif
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
 
-#include "base/bittorrent/magneturi.h"
-#include "base/bittorrent/torrentinfo.h"
-#include "base/preferences.h"
 #include "filesystemwatcher.h"
 
-#ifndef CIFS_MAGIC_NUMBER
-#define CIFS_MAGIC_NUMBER 0xFF534D42
+#include <QtGlobal>
+
+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
+#include <cstring>
+#include <sys/mount.h>
+#include <sys/param.h>
 #endif
 
-#ifndef NFS_SUPER_MAGIC
-#define NFS_SUPER_MAGIC 0x6969
-#endif
+#include "base/algorithm.h"
+#include "base/bittorrent/magneturi.h"
+#include "base/bittorrent/torrentinfo.h"
+#include "base/global.h"
+#include "base/preferences.h"
+#include "base/utils/fs.h"
 
-#ifndef SMB_SUPER_MAGIC
-#define SMB_SUPER_MAGIC 0x517B
-#endif
-
-const int WATCH_INTERVAL = 10000; // 10 sec
-const int MAX_PARTIAL_RETRIES = 5;
+namespace
+{
+    const int WATCH_INTERVAL = 10000; // 10 sec
+    const int MAX_PARTIAL_RETRIES = 5;
+}
 
 FileSystemWatcher::FileSystemWatcher(QObject *parent)
     : QFileSystemWatcher(parent)
 {
-    m_filters << "*.torrent" << "*.magnet";
-    connect(this, SIGNAL(directoryChanged(QString)), SLOT(scanLocalFolder(QString)));
-}
+    connect(this, &QFileSystemWatcher::directoryChanged, this, &FileSystemWatcher::scanLocalFolder);
+
+    m_partialTorrentTimer.setSingleShot(true);
+    connect(&m_partialTorrentTimer, &QTimer::timeout, this, &FileSystemWatcher::processPartialTorrents);
 
-FileSystemWatcher::~FileSystemWatcher()
-{
 #ifndef Q_OS_WIN
-    if (m_watchTimer)
-        delete m_watchTimer;
+    connect(&m_watchTimer, &QTimer::timeout, this, &FileSystemWatcher::scanNetworkFolders);
 #endif
-    if (m_partialTorrentTimer)
-        delete m_partialTorrentTimer;
 }
 
 QStringList FileSystemWatcher::directories() const
 {
-    QStringList dirs;
+    QStringList dirs = QFileSystemWatcher::directories();
 #ifndef Q_OS_WIN
-    if (m_watchTimer) {
-        foreach (const QDir &dir, m_watchedFolders)
-            dirs << dir.canonicalPath();
-    }
+    for (const QDir &dir : qAsConst(m_watchedFolders))
+        dirs << dir.canonicalPath();
 #endif
-    dirs << QFileSystemWatcher::directories();
     return dirs;
 }
 
 void FileSystemWatcher::addPath(const QString &path)
 {
+    if (path.isEmpty()) return;
+
 #if !defined Q_OS_WIN && !defined Q_OS_HAIKU
-    QDir dir(path);
+    const QDir dir(path);
     if (!dir.exists()) return;
 
     // Check if the path points to a network file system or not
-    if (isNetworkFileSystem(path)) {
+    if (Utils::Fs::isNetworkFileSystem(path)) {
         // Network mode
         qDebug("Network folder detected: %s", qUtf8Printable(path));
         qDebug("Using file polling mode instead of inotify...");
         m_watchedFolders << dir;
-        // Set up the watch timer
-        if (!m_watchTimer) {
-            m_watchTimer = new QTimer(this);
-            connect(m_watchTimer, SIGNAL(timeout()), SLOT(scanNetworkFolders()));
-            m_watchTimer->start(WATCH_INTERVAL); // 5 sec
-        }
-    }
-    else {
-#endif
-        // Normal mode
-        qDebug("FS Watching is watching %s in normal mode", qUtf8Printable(path));
-        QFileSystemWatcher::addPath(path);
-        scanLocalFolder(path);
-#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
+
+        m_watchTimer.start(WATCH_INTERVAL);
+        return;
     }
 #endif
+
+    // Normal mode
+    qDebug("FS Watcher is watching %s in normal mode", qUtf8Printable(path));
+    QFileSystemWatcher::addPath(path);
+    scanLocalFolder(path);
 }
 
 void FileSystemWatcher::removePath(const QString &path)
 {
 #ifndef Q_OS_WIN
-    QDir dir(path);
-    for (int i = 0; i < m_watchedFolders.count(); ++i) {
-        if (QDir(m_watchedFolders.at(i)) == dir) {
-            m_watchedFolders.removeAt(i);
-            if (m_watchedFolders.isEmpty())
-                delete m_watchTimer;
-            return;
-        }
+    if (m_watchedFolders.removeOne(path)) {
+        if (m_watchedFolders.isEmpty())
+            m_watchTimer.stop();
+        return;
     }
 #endif
     // Normal mode
     QFileSystemWatcher::removePath(path);
 }
 
-void FileSystemWatcher::scanLocalFolder(QString path)
+void FileSystemWatcher::scanLocalFolder(const QString &path)
 {
-    qDebug("scanLocalFolder(%s) called", qUtf8Printable(path));
-    QStringList torrents;
-    // Local folders scan
-    addTorrentsFromDir(QDir(path), torrents);
-    // Report detected torrent files
-    if (!torrents.empty()) {
-        qDebug("The following files are being reported: %s", qUtf8Printable(torrents.join("\n")));
-        emit torrentsAdded(torrents);
-    }
+    QTimer::singleShot(2000, this, [this, path]() { processTorrentsInDir(path); });
 }
 
+#ifndef Q_OS_WIN
 void FileSystemWatcher::scanNetworkFolders()
 {
-#ifndef Q_OS_WIN
-    qDebug("scanNetworkFolders() called");
-    QStringList torrents;
-    // Network folders scan
-    foreach (const QDir &dir, m_watchedFolders) {
-        //qDebug("FSWatcher: Polling manually folder %s", qUtf8Printable(dir.path()));
-        addTorrentsFromDir(dir, torrents);
-    }
-    // Report detected torrent files
-    if (!torrents.empty()) {
-        qDebug("The following files are being reported: %s", qUtf8Printable(torrents.join("\n")));
-        emit torrentsAdded(torrents);
-    }
-#endif
+    for (const QDir &dir : qAsConst(m_watchedFolders))
+        processTorrentsInDir(dir);
 }
+#endif
 
 void FileSystemWatcher::processPartialTorrents()
 {
     QStringList noLongerPartial;
 
     // Check which torrents are still partial
-    foreach (const QString &torrentPath, m_partialTorrents.keys()) {
-        if (!QFile::exists(torrentPath)) {
-            m_partialTorrents.remove(torrentPath);
-        }
-        else if (BitTorrent::TorrentInfo::loadFromFile(torrentPath).isValid()) {
+    Dict::removeIf(m_partialTorrents, [&noLongerPartial](const QString &torrentPath, int &value)
+    {
+        if (!QFile::exists(torrentPath))
+            return true;
+
+        if (BitTorrent::TorrentInfo::loadFromFile(torrentPath).isValid()) {
             noLongerPartial << torrentPath;
-            m_partialTorrents.remove(torrentPath);
+            return true;
         }
-        else if (m_partialTorrents[torrentPath] >= MAX_PARTIAL_RETRIES) {
-            m_partialTorrents.remove(torrentPath);
-            QFile::rename(torrentPath, torrentPath + ".invalid");
+
+        if (value >= MAX_PARTIAL_RETRIES) {
+            QFile::rename(torrentPath, torrentPath + ".qbt_rejected");
+            return true;
         }
-        else {
-            ++m_partialTorrents[torrentPath];
-        }
-    }
+
+        ++value;
+        return false;
+    });
 
     // Stop the partial timer if necessary
     if (m_partialTorrents.empty()) {
-        m_partialTorrentTimer->stop();
-        m_partialTorrentTimer->deleteLater();
+        m_partialTorrentTimer.stop();
         qDebug("No longer any partial torrent.");
     }
     else {
         qDebug("Still %d partial torrents after delayed processing.", m_partialTorrents.count());
-        m_partialTorrentTimer->start(WATCH_INTERVAL);
+        m_partialTorrentTimer.start(WATCH_INTERVAL);
     }
 
     // Notify of new torrents
@@ -178,99 +163,23 @@ void FileSystemWatcher::processPartialTorrents()
         emit torrentsAdded(noLongerPartial);
 }
 
-void FileSystemWatcher::startPartialTorrentTimer()
+void FileSystemWatcher::processTorrentsInDir(const QDir &dir)
 {
-    Q_ASSERT(!m_partialTorrents.isEmpty());
-    if (!m_partialTorrentTimer) {
-        m_partialTorrentTimer = new QTimer();
-        connect(m_partialTorrentTimer, SIGNAL(timeout()), SLOT(processPartialTorrents()));
-        m_partialTorrentTimer->setSingleShot(true);
-        m_partialTorrentTimer->start(WATCH_INTERVAL);
-    }
-}
-
-void FileSystemWatcher::addTorrentsFromDir(const QDir &dir, QStringList &torrents)
-{
-    const QStringList files = dir.entryList(m_filters, QDir::Files, QDir::Unsorted);
-    foreach (const QString &file, files) {
+    QStringList torrents;
+    const QStringList files = dir.entryList({"*.torrent", "*.magnet"}, QDir::Files);
+    for (const QString &file : files) {
         const QString fileAbsPath = dir.absoluteFilePath(file);
-        if (fileAbsPath.endsWith(".magnet")) {
+        if (file.endsWith(".magnet"))
             torrents << fileAbsPath;
-        }
-        else if (BitTorrent::TorrentInfo::loadFromFile(fileAbsPath).isValid()) {
+        else if (BitTorrent::TorrentInfo::loadFromFile(fileAbsPath).isValid())
             torrents << fileAbsPath;
-        }
-        else if (!m_partialTorrents.contains(fileAbsPath)) {
-            qDebug("Partial torrent detected at: %s", qUtf8Printable(fileAbsPath));
-            qDebug("Delay the file's processing...");
-            m_partialTorrents.insert(fileAbsPath, 0);
-        }
+        else if (!m_partialTorrents.contains(fileAbsPath))
+            m_partialTorrents[fileAbsPath] = 0;
     }
 
-    if (!m_partialTorrents.empty())
-        startPartialTorrentTimer();
+    if (!torrents.empty())
+        emit torrentsAdded(torrents);
+
+    if (!m_partialTorrents.empty() && !m_partialTorrentTimer.isActive())
+        m_partialTorrentTimer.start(WATCH_INTERVAL);
 }
-
-#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
-bool FileSystemWatcher::isNetworkFileSystem(QString path)
-{
-    QString file = path;
-    if (!file.endsWith("/"))
-        file += "/";
-    file += ".";
-    struct statfs buf;
-    if (!statfs(file.toLocal8Bit().constData(), &buf)) {
-#ifdef Q_OS_MAC
-        // XXX: should we make sure HAVE_STRUCT_FSSTAT_F_FSTYPENAME is defined?
-        return ((strcmp(buf.f_fstypename, "nfs") == 0) || (strcmp(buf.f_fstypename, "cifs") == 0) || (strcmp(buf.f_fstypename, "smbfs") == 0));
-#else
-        return ((buf.f_type == static_cast<long>(CIFS_MAGIC_NUMBER))
-            || (buf.f_type == static_cast<long>(NFS_SUPER_MAGIC))
-            || (buf.f_type == static_cast<long>(SMB_SUPER_MAGIC)));
-#endif
-    }
-    else {
-        std::cerr << "Error: statfs() call failed for " << qPrintable(file) << ". Supposing it is a local folder..." << std::endl;
-        switch(errno) {
-        case EACCES:
-            std::cerr << "Search permission is denied for a component of the path prefix of the path" << std::endl;
-            break;
-        case EFAULT:
-            std::cerr << "Buf or path points to an invalid address" << std::endl;
-            break;
-        case EINTR:
-            std::cerr << "This call was interrupted by a signal" << std::endl;
-            break;
-        case EIO:
-            std::cerr << "I/O Error" << std::endl;
-            break;
-        case ELOOP:
-            std::cerr << "Too many symlinks" << std::endl;
-            break;
-        case ENAMETOOLONG:
-            std::cerr << "path is too long" << std::endl;
-            break;
-        case ENOENT:
-            std::cerr << "The file referred by path does not exist" << std::endl;
-            break;
-        case ENOMEM:
-            std::cerr << "Insufficient kernel memory" << std::endl;
-            break;
-        case ENOSYS:
-            std::cerr << "The file system does not detect this call" << std::endl;
-            break;
-        case ENOTDIR:
-            std::cerr << "A component of the path is not a directory" << std::endl;
-            break;
-        case EOVERFLOW:
-            std::cerr << "Some values were too large to be represented in the struct" << std::endl;
-            break;
-        default:
-            std::cerr << "Unknown error" << std::endl;
-        }
-
-        std::cerr << "Errno: " << errno << std::endl;
-        return false;
-    }
-}
-#endif

src/base/filesystemwatcher.h

@@ -1,10 +1,37 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
 #ifndef FILESYSTEMWATCHER_H
 #define FILESYSTEMWATCHER_H
 
 #include <QDir>
 #include <QFileSystemWatcher>
 #include <QHash>
-#include <QPointer>
 #include <QStringList>
 #include <QTimer>
 
@@ -18,7 +45,6 @@ class FileSystemWatcher : public QFileSystemWatcher
 
 public:
     explicit FileSystemWatcher(QObject *parent = nullptr);
-    ~FileSystemWatcher();
 
     QStringList directories() const;
     void addPath(const QString &path);
@@ -28,25 +54,23 @@ signals:
     void torrentsAdded(const QStringList &pathList);
 
 protected slots:
-    void scanLocalFolder(QString path);
-    void scanNetworkFolders();
+    void scanLocalFolder(const QString &path);
     void processPartialTorrents();
+#ifndef Q_OS_WIN
+    void scanNetworkFolders();
+#endif
 
 private:
-    void startPartialTorrentTimer();
-    void addTorrentsFromDir(const QDir &dir, QStringList &torrents);
-#if !defined Q_OS_WIN && !defined Q_OS_HAIKU
-    static bool isNetworkFileSystem(QString path);
-#endif
+    void processTorrentsInDir(const QDir &dir);
+
+    // Partial torrents
+    QHash<QString, int> m_partialTorrents;
+    QTimer m_partialTorrentTimer;
 
 #ifndef Q_OS_WIN
     QList<QDir> m_watchedFolders;
-    QPointer<QTimer> m_watchTimer;
+    QTimer m_watchTimer;
 #endif
-    QStringList m_filters;
-    // Partial torrents
-    QHash<QString, int> m_partialTorrents;
-    QPointer<QTimer> m_partialTorrentTimer;
 };
 
 #endif // FILESYSTEMWATCHER_H

src/base/global.h

@@ -26,5 +26,23 @@
  * exception statement from your version.
  */
 
+#pragma once
+
+#include <type_traits>
+#include <QtGlobal>
+
 const char C_TORRENT_FILE_EXTENSION[] = ".torrent";
 
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+template <typename T>
+constexpr typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; }
+
+// prevent rvalue arguments:
+template <typename T>
+void qAsConst(const T &&) = delete;
+#endif
+
+// returns a const object copy
+template <typename T>
+constexpr typename std::add_const<T>::type copyAsConst(T &&t) noexcept { return std::move(t); }

src/base/http/connection.cpp

@@ -1,7 +1,8 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Mike Tzou (Chocobo1)
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,15 +26,13 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 #include "connection.h"
 
-#include <QRegExp>
 #include <QTcpSocket>
 
+#include "base/logger.h"
 #include "irequesthandler.h"
 #include "requestparser.h"
 #include "responsegenerator.h"
@@ -47,7 +46,7 @@ Connection::Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObj
 {
     m_socket->setParent(this);
     m_idleTimer.start();
-    connect(m_socket, SIGNAL(readyRead()), SLOT(read()));
+    connect(m_socket, &QTcpSocket::readyRead, this, &Connection::read);
 }
 
 Connection::~Connection()
@@ -58,37 +57,64 @@ Connection::~Connection()
 void Connection::read()
 {
     m_idleTimer.restart();
-
     m_receivedData.append(m_socket->readAll());
-    Request request;
-    RequestParser::ErrorCode err = RequestParser::parse(m_receivedData, request);  // TODO: transform request headers to lowercase
 
-    switch (err) {
-    case RequestParser::IncompleteRequest:
-        // Partial request waiting for the rest
-        break;
+    while (!m_receivedData.isEmpty()) {
+        const RequestParser::ParseResult result = RequestParser::parse(m_receivedData);
 
-    case RequestParser::BadRequest:
-        sendResponse(Response(400, "Bad Request"));
-        m_receivedData.clear();
-        break;
+        switch (result.status) {
+        case RequestParser::ParseStatus::Incomplete: {
+                const long bufferLimit = RequestParser::MAX_CONTENT_SIZE * 1.1;  // some margin for headers
+                if (m_receivedData.size() > bufferLimit) {
+                    Logger::instance()->addMessage(tr("Http request size exceeds limiation, closing socket. Limit: %ld, IP: %s")
+                        .arg(bufferLimit).arg(m_socket->peerAddress().toString()), Log::WARNING);
 
-    case RequestParser::NoError:
-        const Environment env {m_socket->localAddress(), m_socket->localPort(), m_socket->peerAddress(), m_socket->peerPort()};
+                    Response resp(413, "Payload Too Large");
+                    resp.headers[HEADER_CONNECTION] = "close";
 
-        Response response = m_requestHandler->processRequest(request, env);
-        if (acceptsGzipEncoding(request.headers["accept-encoding"]))
-            response.headers[HEADER_CONTENT_ENCODING] = "gzip";
-        sendResponse(response);
-        m_receivedData.clear();
-        break;
+                    sendResponse(resp);
+                    m_socket->close();
+                }
+            }
+            return;
+
+        case RequestParser::ParseStatus::BadRequest: {
+                Logger::instance()->addMessage(tr("Bad Http request, closing socket. IP: %s")
+                    .arg(m_socket->peerAddress().toString()), Log::WARNING);
+
+                Response resp(400, "Bad Request");
+                resp.headers[HEADER_CONNECTION] = "close";
+
+                sendResponse(resp);
+                m_socket->close();
+            }
+            return;
+
+        case RequestParser::ParseStatus::OK: {
+                const Environment env {m_socket->localAddress(), m_socket->localPort(), m_socket->peerAddress(), m_socket->peerPort()};
+
+                Response resp = m_requestHandler->processRequest(result.request, env);
+
+                if (acceptsGzipEncoding(result.request.headers["accept-encoding"]))
+                    resp.headers[HEADER_CONTENT_ENCODING] = "gzip";
+
+                resp.headers[HEADER_CONNECTION] = "keep-alive";
+
+                sendResponse(resp);
+                m_receivedData = m_receivedData.mid(result.frameSize);
+            }
+            break;
+
+        default:
+            Q_ASSERT(false);
+            return;
+        }
     }
 }
 
-void Connection::sendResponse(const Response &response)
+void Connection::sendResponse(const Response &response) const
 {
     m_socket->write(toByteArray(response));
-    m_socket->close();  // TODO: remove when HTTP pipelining is supported
 }
 
 bool Connection::hasExpired(const qint64 timeout) const

src/base/http/connection.h

@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
- * Copyright (C) 2006  Ishan Arora and Christophe Dumez
+ * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -25,8 +25,6 @@
  * modify file(s), you may extend this exception to your version of the file(s),
  * but you are not obligated to do so. If you do not wish to do so, delete this
  * exception statement from your version.
- *
- * Contact : chris@qbittorrent.org
  */
 
 
@@ -50,7 +48,7 @@ namespace Http
         Q_DISABLE_COPY(Connection)
 
     public:
-        Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = 0);
+        Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = nullptr);
         ~Connection();
 
         bool hasExpired(qint64 timeout) const;
@@ -61,7 +59,7 @@ namespace Http
 
     private:
         static bool acceptsGzipEncoding(QString codings);
-        void sendResponse(const Response &response);
+        void sendResponse(const Response &response) const;
 
         QTcpSocket *m_socket;
         IRequestHandler *m_requestHandler;

src/base/http/httperror.cpp

@@ -0,0 +1,81 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2017  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include "httperror.h"
+
+HTTPError::HTTPError(int statusCode, const QString &statusText, const QString &message)
+    : RuntimeError {message}
+    , m_statusCode {statusCode}
+    , m_statusText {statusText}
+{
+}
+
+int HTTPError::statusCode() const
+{
+    return m_statusCode;
+}
+
+QString HTTPError::statusText() const
+{
+    return m_statusText;
+}
+
+BadRequestHTTPError::BadRequestHTTPError(const QString &message)
+    : HTTPError(400, QLatin1String("Bad Request"), message)
+{
+}
+
+ConflictHTTPError::ConflictHTTPError(const QString &message)
+    : HTTPError(409, QLatin1String("Conflict"), message)
+{
+}
+
+ForbiddenHTTPError::ForbiddenHTTPError(const QString &message)
+    : HTTPError(403, QLatin1String("Forbidden"), message)
+{
+}
+
+NotFoundHTTPError::NotFoundHTTPError(const QString &message)
+    : HTTPError(404, QLatin1String("Not Found"), message)
+{
+}
+
+UnsupportedMediaTypeHTTPError::UnsupportedMediaTypeHTTPError(const QString &message)
+    : HTTPError(415, QLatin1String("Unsupported Media Type"), message)
+{
+}
+
+UnauthorizedHTTPError::UnauthorizedHTTPError(const QString &message)
+    : HTTPError(401, QLatin1String("Unauthorized"), message)
+{
+}
+
+InternalServerErrorHTTPError::InternalServerErrorHTTPError(const QString &message)
+    : HTTPError(500, QLatin1String("Internal Server Error"), message)
+{
+}

src/base/http/httperror.h

@@ -0,0 +1,86 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2017  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#pragma once
+
+#include "base/exceptions.h"
+
+class HTTPError : public RuntimeError
+{
+public:
+    HTTPError(int statusCode, const QString &statusText, const QString &message = "");
+
+    int statusCode() const;
+    QString statusText() const;
+
+private:
+    const int m_statusCode;
+    const QString m_statusText;
+};
+
+class BadRequestHTTPError : public HTTPError
+{
+public:
+    explicit BadRequestHTTPError(const QString &message = "");
+};
+
+class ForbiddenHTTPError : public HTTPError
+{
+public:
+    explicit ForbiddenHTTPError(const QString &message = "");
+};
+
+class NotFoundHTTPError : public HTTPError
+{
+public:
+    explicit NotFoundHTTPError(const QString &message = "");
+};
+
+class ConflictHTTPError : public HTTPError
+{
+public:
+    explicit ConflictHTTPError(const QString &message = "");
+};
+
+class UnsupportedMediaTypeHTTPError : public HTTPError
+{
+public:
+    explicit UnsupportedMediaTypeHTTPError(const QString &message = "");
+};
+
+class UnauthorizedHTTPError : public HTTPError
+{
+public:
+    explicit UnauthorizedHTTPError(const QString &message = "");
+};
+
+class InternalServerErrorHTTPError : public HTTPError
+{
+public:
+    explicit InternalServerErrorHTTPError(const QString &message = "");
+};

src/base/http/requestparser.cpp

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Mike Tzou (Chocobo1)
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
@@ -30,242 +31,215 @@
 #include "requestparser.h"
 
 #include <QDebug>
-#include <QDir>
+#include <QRegularExpression>
 #include <QStringList>
 #include <QUrl>
 #include <QUrlQuery>
 
-const QByteArray EOL("\r\n");
-const QByteArray EOH("\r\n\r\n");
-
-inline QString unquoted(const QString &str)
-{
-    if ((str[0] == '\"') && (str[str.length() - 1] == '\"'))
-        return str.mid(1, str.length() - 2);
-
-    return str;
-}
+#include "base/utils/bytearray.h"
+#include "base/utils/string.h"
 
 using namespace Http;
+using namespace Utils::ByteArray;
+using QStringPair = QPair<QString, QString>;
 
-RequestParser::ErrorCode RequestParser::parse(const QByteArray &data, Request &request, uint maxContentLength)
+namespace
 {
-    return RequestParser(maxContentLength).parseHttpRequest(data, request);
-}
+    const QByteArray EOH = QByteArray(CRLF).repeated(2);
 
-RequestParser::RequestParser(uint maxContentLength)
-    : m_maxContentLength(maxContentLength)
-{
-}
-
-RequestParser::ErrorCode RequestParser::parseHttpRequest(const QByteArray &data, Request &request)
-{
-    m_request = Request();
-
-    // Parse HTTP request header
-    const int headerEnd = data.indexOf(EOH);
-    if (headerEnd < 0) {
-        qDebug() << Q_FUNC_INFO << "incomplete request";
-        return IncompleteRequest;
+    const QByteArray viewWithoutEndingWith(const QByteArray &in, const QByteArray &str)
+    {
+        if (in.endsWith(str))
+            return QByteArray::fromRawData(in.constData(), (in.size() - str.size()));
+        return in;
     }
 
-    if (!parseHttpHeader(data.left(headerEnd))) {
-        qWarning() << Q_FUNC_INFO << "header parsing error";
-        return BadRequest;
-    }
-
-    // Parse HTTP request message
-    if (m_request.headers.contains("content-length")) {
-        int contentLength = m_request.headers["content-length"].toInt();
-        if (contentLength < 0) {
-            qWarning() << Q_FUNC_INFO << "bad request: content-length is negative";
-            return BadRequest;
+    bool parseHeaderLine(const QString &line, QStringMap &out)
+    {
+        // [rfc7230] 3.2. Header Fields
+        const int i = line.indexOf(':');
+        if (i <= 0) {
+            qWarning() << Q_FUNC_INFO << "invalid http header:" << line;
+            return false;
         }
 
-        if (contentLength > static_cast<int>(m_maxContentLength)) {
-            qWarning() << Q_FUNC_INFO << "bad request: message too long";
-            return BadRequest;
-        }
-
-        QByteArray content = data.mid(headerEnd + EOH.length(), contentLength);
-        if (content.length() < contentLength) {
-            qDebug() << Q_FUNC_INFO << "incomplete request";
-            return IncompleteRequest;
-        }
-
-        if ((contentLength > 0) && !parseContent(content)) {
-            qWarning() << Q_FUNC_INFO << "message parsing error";
-            return BadRequest;
-        }
-    }
-
-    //  qDebug() << Q_FUNC_INFO;
-    //  qDebug() << "HTTP Request header:";
-    //  qDebug() << data.left(headerEnd) << "\n";
-
-    request = m_request;
-    return NoError;
-}
-
-bool RequestParser::parseStartingLine(const QString &line)
-{
-    const QRegExp rx("^([A-Z]+)\\s+(\\S+)\\s+HTTP/\\d\\.\\d$");
-
-    if (rx.indexIn(line.trimmed()) >= 0) {
-        m_request.method = rx.cap(1);
-
-        QUrl url = QUrl::fromEncoded(rx.cap(2).toLatin1());
-        m_request.path = url.path(); // Path
-
-        // Parse GET parameters
-        QListIterator<QPair<QString, QString> > i(QUrlQuery(url).queryItems());
-        while (i.hasNext()) {
-            QPair<QString, QString> pair = i.next();
-            m_request.gets[pair.first] = pair.second;
-        }
+        const QString name = line.leftRef(i).trimmed().toString().toLower();
+        const QString value = line.midRef(i + 1).trimmed().toString();
+        out[name] = value;
 
         return true;
     }
-
-    qWarning() << Q_FUNC_INFO << "invalid http header:" << line;
-    return false;
 }
 
-bool RequestParser::parseHeaderLine(const QString &line, QPair<QString, QString> &out)
+RequestParser::RequestParser()
 {
-    int i = line.indexOf(QLatin1Char(':'));
-    if (i == -1) {
+}
+
+RequestParser::ParseResult RequestParser::parse(const QByteArray &data)
+{
+    // Warning! Header names are converted to lowercase
+    return RequestParser().doParse(data);
+}
+
+RequestParser::ParseResult RequestParser::doParse(const QByteArray &data)
+{
+    // we don't handle malformed requests which use double `LF` as delimiter
+    const int headerEnd = data.indexOf(EOH);
+    if (headerEnd < 0) {
+        qDebug() << Q_FUNC_INFO << "incomplete request";
+        return {ParseStatus::Incomplete, Request(), 0};
+    }
+
+    const QString httpHeaders = QString::fromLatin1(data.constData(), headerEnd);
+    if (!parseStartLines(httpHeaders)) {
+        qWarning() << Q_FUNC_INFO << "header parsing error";
+        return {ParseStatus::BadRequest, Request(), 0};
+    }
+
+    const int headerLength = headerEnd + EOH.length();
+
+    // handle supported methods
+    if ((m_request.method == HEADER_REQUEST_METHOD_GET) || (m_request.method == HEADER_REQUEST_METHOD_HEAD))
+        return {ParseStatus::OK, m_request, headerLength};
+    if (m_request.method == HEADER_REQUEST_METHOD_POST) {
+        bool ok = false;
+        const int contentLength = m_request.headers[HEADER_CONTENT_LENGTH].toInt(&ok);
+        if (!ok || (contentLength < 0)) {
+            qWarning() << Q_FUNC_INFO << "bad request: content-length invalid";
+            return {ParseStatus::BadRequest, Request(), 0};
+        }
+        if (contentLength > MAX_CONTENT_SIZE) {
+            qWarning() << Q_FUNC_INFO << "bad request: message too long";
+            return {ParseStatus::BadRequest, Request(), 0};
+        }
+
+        if (contentLength > 0) {
+            const QByteArray httpBodyView = midView(data, headerLength, contentLength);
+            if (httpBodyView.length() < contentLength) {
+                qDebug() << Q_FUNC_INFO << "incomplete request";
+                return {ParseStatus::Incomplete, Request(), 0};
+            }
+
+            if (!parsePostMessage(httpBodyView)) {
+                qWarning() << Q_FUNC_INFO << "message body parsing error";
+                return {ParseStatus::BadRequest, Request(), 0};
+            }
+        }
+
+        return {ParseStatus::OK, m_request, (headerLength + contentLength)};
+    }
+
+    qWarning() << Q_FUNC_INFO << "unsupported request method: " << m_request.method;
+    return {ParseStatus::BadRequest, Request(), 0};  // TODO: SHOULD respond "501 Not Implemented"
+}
+
+bool RequestParser::parseStartLines(const QString &data)
+{
+    // we don't handle malformed request which uses `LF` for newline
+    const QVector<QStringRef> lines = data.splitRef(CRLF, QString::SkipEmptyParts);
+
+    // [rfc7230] 3.2.2. Field Order
+    QStringList requestLines;
+    for (const auto &line : lines) {
+        if (line.at(0).isSpace() && !requestLines.isEmpty()) {
+            // continuation of previous line
+            requestLines.last() += line.toString();
+        }
+        else {
+            requestLines += line.toString();
+        }
+    }
+
+    if (requestLines.isEmpty())
+        return false;
+
+    if (!parseRequestLine(requestLines[0]))
+        return false;
+
+    for (auto i = ++(requestLines.begin()); i != requestLines.end(); ++i) {
+        if (!parseHeaderLine(*i, m_request.headers))
+            return false;
+    }
+
+    return true;
+}
+
+bool RequestParser::parseRequestLine(const QString &line)
+{
+    // [rfc7230] 3.1.1. Request Line
+
+    const QRegularExpression re(QLatin1String("^([A-Z]+)\\s+(\\S+)\\s+HTTP\\/(\\d\\.\\d)$"));
+    const QRegularExpressionMatch match = re.match(line);
+
+    if (!match.hasMatch()) {
         qWarning() << Q_FUNC_INFO << "invalid http header:" << line;
         return false;
     }
 
-    out = qMakePair(line.left(i).trimmed().toLower(), line.mid(i + 1).trimmed());
-    return true;
-}
+    // Request Methods
+    m_request.method = match.captured(1);
 
-bool RequestParser::parseHttpHeader(const QByteArray &data)
-{
-    QString str = QString::fromUtf8(data);
-    QStringList lines = str.trimmed().split(EOL);
+    // Request Target
+    const QByteArray decodedUrl {QByteArray::fromPercentEncoding(match.captured(2).toLatin1())};
+    const int sepPos = decodedUrl.indexOf('?');
+    m_request.path = QString::fromUtf8(decodedUrl.constData(), (sepPos == -1 ? decodedUrl.size() : sepPos));
+    if (sepPos >= 0)
+        m_request.query = decodedUrl.mid(sepPos + 1);
 
-    QStringList headerLines;
-    foreach (const QString &line, lines) {
-        if (line[0].isSpace()) { // header line continuation
-            if (!headerLines.isEmpty()) { // really continuation
-                headerLines.last() += QLatin1Char(' ');
-                headerLines.last() += line.trimmed();
-            }
-        }
-        else {
-            headerLines.append(line);
-        }
-    }
-
-    if (headerLines.isEmpty())
-        return false; // Empty header
-
-    QStringList::Iterator it = headerLines.begin();
-    if (!parseStartingLine(*it))
-        return false;
-
-    ++it;
-    for (; it != headerLines.end(); ++it) {
-        QPair<QString, QString> header;
-        if (!parseHeaderLine(*it, header))
-            return false;
-
-        m_request.headers[header.first] = header.second;
-    }
+    // HTTP-version
+    m_request.version = match.captured(3);
 
     return true;
 }
 
-QList<QByteArray> RequestParser::splitMultipartData(const QByteArray &data, const QByteArray &boundary)
+bool RequestParser::parsePostMessage(const QByteArray &data)
 {
-    QList<QByteArray> ret;
-    QByteArray sep = boundary + EOL;
-    const int sepLength = sep.size();
+    // parse POST message-body
+    const QString contentType = m_request.headers[HEADER_CONTENT_TYPE];
+    const QString contentTypeLower = contentType.toLower();
 
-    int start = 0, end = 0;
-    if ((end = data.indexOf(sep, start)) >= 0) {
-        start = end + sepLength; // skip first boundary
-
-        while ((end = data.indexOf(sep, start)) >= 0) {
-            ret << data.mid(start, end - EOL.length() - start);
-            start = end + sepLength;
-        }
-
-        // last or single part
-        sep = boundary + "--" + EOL;
-        if ((end = data.indexOf(sep, start)) >= 0)
-            ret << data.mid(start, end - EOL.length() - start);
-    }
-
-    return ret;
-}
-
-bool RequestParser::parseContent(const QByteArray &data)
-{
-    // Parse message content
-    qDebug() << Q_FUNC_INFO << "Content-Length: " << m_request.headers["content-length"];
-    qDebug() << Q_FUNC_INFO << "data.size(): " << data.size();
-
-    // Parse url-encoded POST data
-    if (m_request.headers["content-type"].startsWith("application/x-www-form-urlencoded")) {
-        QUrl url;
-        url.setQuery(data);
-        QListIterator<QPair<QString, QString> > i(QUrlQuery(url).queryItems(QUrl::FullyDecoded));
+    // application/x-www-form-urlencoded
+    if (contentTypeLower.startsWith(CONTENT_TYPE_FORM_ENCODED)) {
+        QListIterator<QStringPair> i(QUrlQuery(data).queryItems(QUrl::FullyDecoded));
         while (i.hasNext()) {
-            QPair<QString, QString> pair = i.next();
-            m_request.posts[pair.first.toLower()] = pair.second;
+            const QStringPair pair = i.next();
+            m_request.posts[pair.first] = pair.second;
         }
 
         return true;
     }
 
-    // Parse multipart/form data (torrent file)
-    /**
-        data has the following format (if boundary is "cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5")
+    // multipart/form-data
+    if (contentTypeLower.startsWith(CONTENT_TYPE_FORM_DATA)) {
+        // [rfc2046] 5.1.1. Common Syntax
 
---cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5
-Content-Disposition: form-data; name=\"Filename\"
-
-PB020344.torrent
---cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5
-Content-Disposition: form-data; name=\"torrentfile"; filename=\"PB020344.torrent\"
-Content-Type: application/x-bittorrent
-
-BINARY DATA IS HERE
---cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5
-Content-Disposition: form-data; name=\"Upload\"
-
-Submit Query
---cH2ae0GI3KM7GI3Ij5ae0ei4Ij5Ij5--
-**/
-    QString contentType = m_request.headers["content-type"];
-    if (contentType.startsWith("multipart/form-data")) {
-        const QRegExp boundaryRegexQuoted("boundary=\"([ \\w'()+,-\\./:=\\?]+)\"");
-        const QRegExp boundaryRegexNotQuoted("boundary=([\\w'()+,-\\./:=\\?]+)");
-
-        QByteArray boundary;
-        if (boundaryRegexQuoted.indexIn(contentType) < 0) {
-            if (boundaryRegexNotQuoted.indexIn(contentType) < 0) {
-                qWarning() << "Could not find boundary in multipart/form-data header!";
-                return false;
-            }
-            else {
-                boundary = "--" + boundaryRegexNotQuoted.cap(1).toLatin1();
-            }
-        }
-        else {
-            boundary = "--" + boundaryRegexQuoted.cap(1).toLatin1();
+        // find boundary delimiter
+        const QLatin1String boundaryFieldName("boundary=");
+        const int idx = contentType.indexOf(boundaryFieldName);
+        if (idx < 0) {
+            qWarning() << Q_FUNC_INFO << "Could not find boundary in multipart/form-data header!";
+            return false;
         }
 
-        qDebug() << "Boundary is " << boundary;
-        QList<QByteArray> parts = splitMultipartData(data, boundary);
-        qDebug() << parts.size() << "parts in data";
+        const QByteArray delimiter = Utils::String::unquote(contentType.midRef(idx + boundaryFieldName.size())).toLatin1();
+        if (delimiter.isEmpty()) {
+            qWarning() << Q_FUNC_INFO << "boundary delimiter field empty!";
+            return false;
+        }
 
-        foreach (const QByteArray& part, parts) {
+        // split data by "dash-boundary"
+        const QByteArray dashDelimiter = QByteArray("--") + delimiter + CRLF;
+        QList<QByteArray> multipart = splitToViews(data, dashDelimiter, QString::SkipEmptyParts);
+        if (multipart.isEmpty()) {
+            qWarning() << Q_FUNC_INFO << "multipart empty";
+            return false;
+        }
+
+        // remove the ending delimiter
+        const QByteArray endDelimiter = QByteArray("--") + delimiter + QByteArray("--") + CRLF;
+        multipart.push_back(viewWithoutEndingWith(multipart.takeLast(), endDelimiter));
+
+        for (const auto &part : multipart) {
             if (!parseFormData(part))
                 return false;
         }
@@ -273,71 +247,60 @@ Submit Query
         return true;
     }
 
-    qWarning() << Q_FUNC_INFO << "unknown content type:" << qPrintable(contentType);
+    qWarning() << Q_FUNC_INFO << "unknown content type:" << contentType;
     return false;
 }
 
 bool RequestParser::parseFormData(const QByteArray &data)
 {
-    // Parse form data header
-    const int headerEnd = data.indexOf(EOH);
-    if (headerEnd < 0) {
-        qDebug() << "Invalid form data: \n" << data;
+    const QList<QByteArray> list = splitToViews(data, EOH, QString::KeepEmptyParts);
+
+    if (list.size() != 2) {
+        qWarning() << Q_FUNC_INFO << "multipart/form-data format error";
         return false;
     }
 
-    QString headerStr = QString::fromUtf8(data.left(headerEnd));
-    QStringList lines = headerStr.trimmed().split(EOL);
-    QStringMap headers;
-    foreach (const QString& line, lines) {
-        QPair<QString, QString> header;
-        if (!parseHeaderLine(line, header))
-            return false;
+    const QString headers = QString::fromLatin1(list[0]);
+    const QByteArray payload = viewWithoutEndingWith(list[1], CRLF);
 
-        headers[header.first] = header.second;
+    QStringMap headersMap;
+    const QVector<QStringRef> headerLines = headers.splitRef(CRLF, QString::SkipEmptyParts);
+    for (const auto &line : headerLines) {
+        if (line.trimmed().startsWith(HEADER_CONTENT_DISPOSITION, Qt::CaseInsensitive)) {
+            // extract out filename & name
+            const QVector<QStringRef> directives = line.split(';', QString::SkipEmptyParts);
+
+            for (const auto &directive : directives) {
+                const int idx = directive.indexOf('=');
+                if (idx < 0)
+                    continue;
+
+                const QString name = directive.left(idx).trimmed().toString().toLower();
+                const QString value = Utils::String::unquote(directive.mid(idx + 1).trimmed()).toString();
+                headersMap[name] = value;
+            }
+        }
+        else {
+            if (!parseHeaderLine(line.toString(), headersMap))
+                return false;
+        }
     }
 
-    QStringMap disposition;
-    if (!headers.contains("content-disposition")
-        || !parseHeaderValue(headers["content-disposition"], disposition)
-        || !disposition.contains("name")) {
-        qDebug() << "Invalid form data header: \n" << headerStr;
-        return false;
+    // pick data
+    const QLatin1String filename("filename");
+    const QLatin1String name("name");
+
+    if (headersMap.contains(filename)) {
+        m_request.files.append({headersMap[filename], headersMap[HEADER_CONTENT_TYPE], payload});
     }
-
-    if (disposition.contains("filename")) {
-        UploadedFile ufile;
-        ufile.filename = disposition["filename"];
-        ufile.type = disposition["content-type"];
-        ufile.data = data.mid(headerEnd + EOH.length());
-
-        m_request.files.append(ufile);
+    else if (headersMap.contains(name)) {
+        m_request.posts[headersMap[name]] = payload;
     }
     else {
-        m_request.posts[disposition["name"]] = QString::fromUtf8(data.mid(headerEnd + EOH.length()));
-    }
-
-    return true;
-}
-
-bool RequestParser::parseHeaderValue(const QString &value, QStringMap &out)
-{
-    int pos = value.indexOf(QLatin1Char(';'));
-    if (pos == -1) {
-        out[""] = value.trimmed();
-        return true;
-    }
-
-    out[""] = value.left(pos).trimmed();
-
-    QRegExp rx(";\\s*([^=;\"]+)\\s*=\\s*(\"[^\"]*\"|[^\";\\s]+)\\s*");
-    while (rx.indexIn(value, pos) == pos) {
-        out[rx.cap(1).trimmed()] = unquoted(rx.cap(2));
-        pos += rx.cap(0).length();
-    }
-
-    if (pos != value.length())
+        // malformed
+        qWarning() << Q_FUNC_INFO << "multipart/form-data header error";
         return false;
+    }
 
     return true;
 }

src/base/http/requestparser.h

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Mike Tzou (Chocobo1)
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Ishan Arora and Christophe Dumez <chris@qbittorrent.org>
  *
@@ -37,32 +38,35 @@ namespace Http
     class RequestParser
     {
     public:
-        enum ErrorCode
+        enum class ParseStatus
         {
-            NoError = 0,
-            IncompleteRequest,
+            OK,
+            Incomplete,
             BadRequest
         };
 
-        // when result != NoError parsed request is undefined
-        // Warning! Header names are converted to lower-case.
-        static ErrorCode parse(const QByteArray &data, Request &request, uint maxContentLength = 10000000 /* ~10MB */);
+        struct ParseResult
+        {
+            // when `status != ParseStatus::OK`, `request` & `frameSize` are undefined
+            ParseStatus status;
+            Request request;
+            long frameSize;  // http request frame size (bytes)
+        };
+
+        static ParseResult parse(const QByteArray &data);
+
+        static const long MAX_CONTENT_SIZE = 64 * 1024 * 1024;  // 64 MB
 
     private:
-        RequestParser(uint maxContentLength);
+        RequestParser();
 
-        ErrorCode parseHttpRequest(const QByteArray &data, Request &request);
+        ParseResult doParse(const QByteArray &data);
+        bool parseStartLines(const QString &data);
+        bool parseRequestLine(const QString &line);
 
-        bool parseHttpHeader(const QByteArray &data);
-        bool parseStartingLine(const QString &line);
-        bool parseContent(const QByteArray &data);
+        bool parsePostMessage(const QByteArray &data);
         bool parseFormData(const QByteArray &data);
-        QList<QByteArray> splitMultipartData(const QByteArray &data, const QByteArray &boundary);
 
-        static bool parseHeaderLine(const QString &line, QPair<QString, QString> &out);
-        static bool parseHeaderValue(const QString &value, QStringMap &out);
-
-        const uint m_maxContentLength;
         Request m_request;
     };
 }

src/base/http/responsebuilder.cpp

@@ -30,11 +30,6 @@
 
 using namespace Http;
 
-ResponseBuilder::ResponseBuilder(QObject *parent)
-    : QObject(parent)
-{
-}
-
 void ResponseBuilder::status(uint code, const QString &text)
 {
     m_response.status = ResponseStatus(code, text);

src/base/http/responsebuilder.h

@@ -29,17 +29,13 @@
 #ifndef HTTP_RESPONSEBUILDER_H
 #define HTTP_RESPONSEBUILDER_H
 
-#include <QObject>
 #include "types.h"
 
 namespace Http
 {
-    class ResponseBuilder : public QObject
+    class ResponseBuilder
     {
     public:
-        explicit ResponseBuilder(QObject *parent = nullptr);
-
-    protected:
         void status(uint code = 200, const QString &text = QLatin1String("OK"));
         void header(const QString &name, const QString &value);
         void print(const QString &text, const QString &type = CONTENT_TYPE_HTML);

src/base/http/types.h

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2018  Mike Tzou (Chocobo1)
  * Copyright (C) 2014  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
@@ -37,7 +38,12 @@
 
 namespace Http
 {
+    const char METHOD_GET[] = "GET";
+    const char METHOD_POST[] = "POST";
+
     const char HEADER_CACHE_CONTROL[] = "cache-control";
+    const char HEADER_CONNECTION[] = "connection";
+    const char HEADER_CONTENT_DISPOSITION[] = "content-disposition";
     const char HEADER_CONTENT_ENCODING[] = "content-encoding";
     const char HEADER_CONTENT_LENGTH[] = "content-length";
     const char HEADER_CONTENT_SECURITY_POLICY[] = "content-security-policy";
@@ -52,15 +58,21 @@ namespace Http
     const char HEADER_X_FRAME_OPTIONS[] = "x-frame-options";
     const char HEADER_X_XSS_PROTECTION[] = "x-xss-protection";
 
-    const char CONTENT_TYPE_CSS[] = "text/css; charset=UTF-8";
-    const char CONTENT_TYPE_GIF[] = "image/gif";
-    const char CONTENT_TYPE_HTML[] = "text/html; charset=UTF-8";
-    const char CONTENT_TYPE_JS[] = "application/javascript; charset=UTF-8";
-    const char CONTENT_TYPE_JSON[] = "application/json";
-    const char CONTENT_TYPE_PNG[] = "image/png";
-    const char CONTENT_TYPE_TXT[] = "text/plain; charset=UTF-8";
+    const char HEADER_REQUEST_METHOD_GET[] = "GET";
+    const char HEADER_REQUEST_METHOD_HEAD[] = "HEAD";
+    const char HEADER_REQUEST_METHOD_POST[] = "POST";
 
-    // portability: "\r\n" doesn't guarantee mapping to the correct value
+    const char CONTENT_TYPE_HTML[] = "text/html";
+    const char CONTENT_TYPE_CSS[] = "text/css";
+    const char CONTENT_TYPE_TXT[] = "text/plain";
+    const char CONTENT_TYPE_JS[] = "application/javascript";
+    const char CONTENT_TYPE_JSON[] = "application/json";
+    const char CONTENT_TYPE_GIF[] = "image/gif";
+    const char CONTENT_TYPE_PNG[] = "image/png";
+    const char CONTENT_TYPE_FORM_ENCODED[] = "application/x-www-form-urlencoded";
+    const char CONTENT_TYPE_FORM_DATA[] = "multipart/form-data";
+
+    // portability: "\r\n" doesn't guarantee mapping to the correct symbol
     const char CRLF[] = {0x0D, 0x0A, '\0'};
 
     struct Environment
@@ -74,17 +86,18 @@ namespace Http
 
     struct UploadedFile
     {
-        QString filename; // original filename
-        QString type; // MIME type
-        QByteArray data; // File data
+        QString filename;
+        QString type;  // MIME type
+        QByteArray data;
     };
 
     struct Request
     {
+        QString version;
         QString method;
         QString path;
+        QByteArray query;
         QStringMap headers;
-        QStringMap gets;
         QStringMap posts;
         QVector<UploadedFile> files;
     };

src/base/iconprovider.cpp

@@ -27,7 +27,6 @@
  * exception statement from your version.
  */
 
-#include <QString>
 #include "iconprovider.h"
 
 IconProvider::IconProvider(QObject *parent)
@@ -47,7 +46,7 @@ void IconProvider::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -56,9 +55,9 @@ IconProvider *IconProvider::instance()
     return m_instance;
 }
 
-QString IconProvider::getIconPath(const QString &iconId)
+QString IconProvider::getIconPath(const QString &iconId) const
 {
     return ":/icons/qbt-theme/" + iconId + ".png";
 }
 
-IconProvider *IconProvider::m_instance = 0;
+IconProvider *IconProvider::m_instance = nullptr;

src/base/iconprovider.h

@@ -31,8 +31,7 @@
 #define ICONPROVIDER_H
 
 #include <QObject>
-
-class QString;
+#include <QString>
 
 class IconProvider : public QObject
 {
@@ -43,10 +42,10 @@ public:
     static void freeInstance();
     static IconProvider *instance();
 
-    virtual QString getIconPath(const QString &iconId);
+    virtual QString getIconPath(const QString &iconId) const;
 
 protected:
-    explicit IconProvider(QObject *parent = 0);
+    explicit IconProvider(QObject *parent = nullptr);
     ~IconProvider();
 
     static IconProvider *m_instance;

src/base/indexrange.h

@@ -38,30 +38,30 @@ class IndexInterval
 public:
     using IndexType = Index;
 
-    IndexInterval(IndexType first, IndexType last)
+    IndexInterval(IndexType first, IndexType last)  // add constexpr when using C++14
         : m_first {first}
         , m_last {last}
     {
         Q_ASSERT(first <= last);
     }
 
-    IndexType first() const
+    constexpr IndexType first() const
     {
         return m_first;
     }
 
-    IndexType last() const
+    constexpr IndexType last() const
     {
         return m_last;
     }
 
 private:
-    IndexType m_first;
-    IndexType m_last;
+    const IndexType m_first;
+    const IndexType m_last;
 };
 
 template <typename T>
-inline IndexInterval<T> makeInterval(T first, T last)
+constexpr IndexInterval<T> makeInterval(T first, T last)
 {
     return {first, last};
 }
@@ -99,7 +99,7 @@ public:
 
     constexpr IndexType end() const
     {
-        return m_first + m_size;
+        return (m_first + m_size);
     }
 
     constexpr IndexDiffType size() const
@@ -114,12 +114,12 @@ public:
 
     constexpr IndexType last() const
     {
-        return m_first + m_size - 1;
+        return (m_first + m_size - 1);
     }
 
     constexpr bool isEmpty() const
     {
-        return m_size == 0;
+        return (m_size == 0);
     }
 
 private:

src/base/logger.cpp

@@ -3,12 +3,12 @@
 #include <QDateTime>
 #include "base/utils/string.h"
 
-Logger* Logger::m_instance = 0;
+Logger *Logger::m_instance = nullptr;
 
 Logger::Logger()
-    : lock(QReadWriteLock::Recursive)
-    , msgCounter(0)
-    , peerCounter(0)
+    : m_lock(QReadWriteLock::Recursive)
+    , m_msgCounter(0)
+    , m_peerCounter(0)
 {
 }
 
@@ -29,15 +29,15 @@ void Logger::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
 void Logger::addMessage(const QString &message, const Log::MsgType &type)
 {
-    QWriteLocker locker(&lock);
+    QWriteLocker locker(&m_lock);
 
-    Log::Msg temp = { msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped() };
+    Log::Msg temp = {m_msgCounter++, QDateTime::currentMSecsSinceEpoch(), type, message.toHtmlEscaped()};
     m_messages.push_back(temp);
 
     if (m_messages.size() >= MAX_LOG_MESSAGES)
@@ -48,9 +48,9 @@ void Logger::addMessage(const QString &message, const Log::MsgType &type)
 
 void Logger::addPeer(const QString &ip, bool blocked, const QString &reason)
 {
-    QWriteLocker locker(&lock);
+    QWriteLocker locker(&m_lock);
 
-    Log::Peer temp = { peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped() };
+    Log::Peer temp = {m_peerCounter++, QDateTime::currentMSecsSinceEpoch(), ip.toHtmlEscaped(), blocked, reason.toHtmlEscaped()};
     m_peers.push_back(temp);
 
     if (m_peers.size() >= MAX_LOG_MESSAGES)
@@ -61,9 +61,9 @@ void Logger::addPeer(const QString &ip, bool blocked, const QString &reason)
 
 QVector<Log::Msg> Logger::getMessages(int lastKnownId) const
 {
-    QReadLocker locker(&lock);
+    QReadLocker locker(&m_lock);
 
-    int diff = msgCounter - lastKnownId - 1;
+    int diff = m_msgCounter - lastKnownId - 1;
     int size = m_messages.size();
 
     if ((lastKnownId == -1) || (diff >= size))
@@ -77,9 +77,9 @@ QVector<Log::Msg> Logger::getMessages(int lastKnownId) const
 
 QVector<Log::Peer> Logger::getPeers(int lastKnownId) const
 {
-    QReadLocker locker(&lock);
+    QReadLocker locker(&m_lock);
 
-    int diff = peerCounter - lastKnownId - 1;
+    int diff = m_peerCounter - lastKnownId - 1;
     int size = m_peers.size();
 
     if ((lastKnownId == -1) || (diff >= size))

src/base/logger.h

@@ -1,10 +1,10 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
+#include <QObject>
+#include <QReadWriteLock>
 #include <QString>
 #include <QVector>
-#include <QReadWriteLock>
-#include <QObject>
 
 const int MAX_LOG_MESSAGES = 20000;
 
@@ -16,7 +16,7 @@ namespace Log
         NORMAL = 0x1,
         INFO = 0x2,
         WARNING = 0x4,
-        CRITICAL = 0x8 //ERROR is defined by libtorrent and results in compiler error
+        CRITICAL = 0x8 // ERROR is defined by libtorrent and results in compiler error
     };
     Q_DECLARE_FLAGS(MsgTypes, MsgType)
 
@@ -63,12 +63,12 @@ private:
     Logger();
     ~Logger();
 
-    static Logger* m_instance;
+    static Logger *m_instance;
     QVector<Log::Msg> m_messages;
     QVector<Log::Peer> m_peers;
-    mutable QReadWriteLock lock;
-    int msgCounter;
-    int peerCounter;
+    mutable QReadWriteLock m_lock;
+    int m_msgCounter;
+    int m_peerCounter;
 };
 
 // Helper function

src/base/net/dnsupdater.cpp

@@ -26,15 +26,15 @@
  * exception statement from your version.
  */
 
+#include "dnsupdater.h"
+
 #include <QDebug>
-#include <QRegExp>
-#include <QStringList>
+#include <QRegularExpression>
 #include <QUrlQuery>
 
 #include "base/logger.h"
 #include "base/net/downloadhandler.h"
 #include "base/net/downloadmanager.h"
-#include "dnsupdater.h"
 
 using namespace Net;
 
@@ -52,7 +52,7 @@ DNSUpdater::DNSUpdater(QObject *parent)
 
     // Start IP checking timer
     m_ipCheckTimer.setInterval(IP_CHECK_INTERVAL_MS);
-    connect(&m_ipCheckTimer, SIGNAL(timeout()), SLOT(checkPublicIP()));
+    connect(&m_ipCheckTimer, &QTimer::timeout, this, &DNSUpdater::checkPublicIP);
     m_ipCheckTimer.start();
 
     // Check lastUpdate to avoid flooding
@@ -74,11 +74,11 @@ void DNSUpdater::checkPublicIP()
 {
     Q_ASSERT(m_state == OK);
 
-    DownloadHandler *handler = DownloadManager::instance()->downloadUrl(
-                "http://checkip.dyndns.org", false, 0, false,
-                "qBittorrent/" QBT_VERSION_2);
-    connect(handler, SIGNAL(downloadFinished(QString, QByteArray)), SLOT(ipRequestFinished(QString, QByteArray)));
-    connect(handler, SIGNAL(downloadFailed(QString, QString)), SLOT(ipRequestFailed(QString, QString)));
+    DownloadHandler *handler = DownloadManager::instance()->download(
+                DownloadRequest("http://checkip.dyndns.org").userAgent("qBittorrent/" QBT_VERSION_2));
+    connect(handler, static_cast<void (Net::DownloadHandler::*)(const QString &, const QByteArray &)>(&Net::DownloadHandler::downloadFinished)
+            , this, &DNSUpdater::ipRequestFinished);
+    connect(handler, &Net::DownloadHandler::downloadFailed, this, &DNSUpdater::ipRequestFailed);
 
     m_lastIPCheckTime = QDateTime::currentDateTime();
 }
@@ -88,9 +88,9 @@ void DNSUpdater::ipRequestFinished(const QString &url, const QByteArray &data)
     Q_UNUSED(url);
 
     // Parse response
-    QRegExp ipregex("Current IP Address:\\s+([^<]+)</body>");
-    if (ipregex.indexIn(data) >= 0) {
-        QString ipStr = ipregex.cap(1);
+    const QRegularExpressionMatch ipRegexMatch = QRegularExpression("Current IP Address:\\s+([^<]+)</body>").match(data);
+    if (ipRegexMatch.hasMatch()) {
+        QString ipStr = ipRegexMatch.captured(1);
         qDebug() << Q_FUNC_INFO << "Regular expression captured the following IP:" << ipStr;
         QHostAddress newIp(ipStr);
         if (!newIp.isNull()) {
@@ -121,11 +121,11 @@ void DNSUpdater::updateDNSService()
     qDebug() << Q_FUNC_INFO;
 
     m_lastIPCheckTime = QDateTime::currentDateTime();
-    DownloadHandler *handler = DownloadManager::instance()->downloadUrl(
-                getUpdateUrl(), false, 0, false,
-                "qBittorrent/" QBT_VERSION_2);
-    connect(handler, SIGNAL(downloadFinished(QString, QByteArray)), SLOT(ipUpdateFinished(QString, QByteArray)));
-    connect(handler, SIGNAL(downloadFailed(QString, QString)), SLOT(ipUpdateFailed(QString, QString)));
+    DownloadHandler *handler = DownloadManager::instance()->download(
+                DownloadRequest(getUpdateUrl()).userAgent("qBittorrent/" QBT_VERSION_2));
+    connect(handler, static_cast<void (Net::DownloadHandler::*)(const QString &, const QByteArray &)>(&Net::DownloadHandler::downloadFinished)
+            , this, &DNSUpdater::ipUpdateFinished);
+    connect(handler, &Net::DownloadHandler::downloadFailed, this, &DNSUpdater::ipUpdateFailed);
 }
 
 QString DNSUpdater::getUpdateUrl() const
@@ -181,7 +181,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
 {
     Logger *const logger = Logger::instance();
     qDebug() << Q_FUNC_INFO << reply;
-    QString code = reply.split(" ").first();
+    QString code = reply.split(' ').first();
     qDebug() << Q_FUNC_INFO << "Code:" << code;
 
     if ((code == "good") || (code == "nochg")) {
@@ -196,7 +196,7 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
         return;
     }
 
-    // Everything bellow is an error, stop updating until the user updates something
+    // Everything below is an error, stop updating until the user updates something
     m_ipCheckTimer.stop();
     m_lastIP.clear();
     if (code == "nohost") {
@@ -244,8 +244,8 @@ void DNSUpdater::updateCredentials()
     }
     if (m_domain != pref->getDynDomainName()) {
         m_domain = pref->getDynDomainName();
-        QRegExp domain_regex("^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$");
-        if (domain_regex.indexIn(m_domain) < 0) {
+        const QRegularExpressionMatch domainRegexMatch = QRegularExpression("^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$").match(m_domain);
+        if (!domainRegexMatch.hasMatch()) {
             logger->addMessage(tr("Dynamic DNS error: supplied domain name is invalid."), Log::CRITICAL);
             m_lastIP.clear();
             m_ipCheckTimer.stop();

src/base/net/downloadhandler.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -29,11 +29,11 @@
 
 #include "downloadhandler.h"
 
+#include <QCoreApplication>
 #include <QDebug>
 #include <QNetworkAccessManager>
 #include <QNetworkCookie>
 #include <QNetworkProxy>
-#include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QTemporaryFile>
 #include <QUrl>
@@ -43,35 +43,57 @@
 #include "base/utils/misc.h"
 #include "downloadmanager.h"
 
-static QString errorCodeToString(QNetworkReply::NetworkError status);
+namespace
+{
+    bool saveToFile(const QByteArray &replyData, QString &filePath)
+    {
+        QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"};
+        tmpfile.setAutoRemove(false);
 
-using namespace Net;
+        if (!tmpfile.open())
+            return false;
 
-DownloadHandler::DownloadHandler(QNetworkReply *reply, DownloadManager *manager, bool saveToFile, qint64 limit, bool handleRedirectToMagnet)
+        filePath = tmpfile.fileName();
+
+        tmpfile.write(replyData);
+        return true;
+    }
+}
+
+Net::DownloadHandler::DownloadHandler(QNetworkReply *reply, DownloadManager *manager, const DownloadRequest &downloadRequest)
     : QObject(manager)
     , m_reply(reply)
     , m_manager(manager)
-    , m_saveToFile(saveToFile)
-    , m_sizeLimit(limit)
-    , m_handleRedirectToMagnet(handleRedirectToMagnet)
-    , m_url(reply->url().toString())
+    , m_downloadRequest(downloadRequest)
 {
-    init();
+    if (reply)
+        assignNetworkReply(reply);
 }
 
-DownloadHandler::~DownloadHandler()
+Net::DownloadHandler::~DownloadHandler()
 {
     if (m_reply)
         delete m_reply;
 }
 
-// Returns original url
-QString DownloadHandler::url() const
+void Net::DownloadHandler::assignNetworkReply(QNetworkReply *reply)
 {
-    return m_url;
+    Q_ASSERT(reply);
+
+    m_reply = reply;
+    m_reply->setParent(this);
+    if (m_downloadRequest.limit() > 0)
+        connect(m_reply, &QNetworkReply::downloadProgress, this, &Net::DownloadHandler::checkDownloadSize);
+    connect(m_reply, &QNetworkReply::finished, this, &Net::DownloadHandler::processFinishedDownload);
 }
 
-void DownloadHandler::processFinishedDownload()
+// Returns original url
+QString Net::DownloadHandler::url() const
+{
+    return m_downloadRequest.url();
+}
+
+void Net::DownloadHandler::processFinishedDownload()
 {
     QString url = m_reply->url().toString();
     qDebug("Download finished: %s", qUtf8Printable(url));
@@ -79,7 +101,7 @@ void DownloadHandler::processFinishedDownload()
     if (m_reply->error() != QNetworkReply::NoError) {
         // Failure
         qDebug("Download failure (%s), reason: %s", qUtf8Printable(url), qUtf8Printable(errorCodeToString(m_reply->error())));
-        emit downloadFailed(m_url, errorCodeToString(m_reply->error()));
+        emit downloadFailed(m_downloadRequest.url(), errorCodeToString(m_reply->error()));
         this->deleteLater();
     }
     else {
@@ -97,15 +119,15 @@ void DownloadHandler::processFinishedDownload()
                 replyData = Utils::Gzip::decompress(replyData);
             }
 
-            if (m_saveToFile) {
+            if (m_downloadRequest.saveToFile()) {
                 QString filePath;
                 if (saveToFile(replyData, filePath))
-                    emit downloadFinished(m_url, filePath);
+                    emit downloadFinished(m_downloadRequest.url(), filePath);
                 else
-                    emit downloadFailed(m_url, tr("I/O Error"));
-                }
+                    emit downloadFailed(m_downloadRequest.url(), tr("I/O Error"));
+            }
             else {
-                emit downloadFinished(m_url, replyData);
+                emit downloadFinished(m_downloadRequest.url(), replyData);
             }
 
             this->deleteLater();
@@ -113,137 +135,116 @@ void DownloadHandler::processFinishedDownload()
     }
 }
 
-void DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
+void Net::DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal)
 {
     QString msg = tr("The file size is %1. It exceeds the download limit of %2.");
 
     if (bytesTotal > 0) {
         // Total number of bytes is available
-        if (bytesTotal > m_sizeLimit) {
+        if (bytesTotal > m_downloadRequest.limit()) {
             m_reply->abort();
-            emit downloadFailed(m_url, msg.arg(Utils::Misc::friendlyUnit(bytesTotal)).arg(Utils::Misc::friendlyUnit(m_sizeLimit)));
+            emit downloadFailed(m_downloadRequest.url(), msg.arg(Utils::Misc::friendlyUnit(bytesTotal), Utils::Misc::friendlyUnit(m_downloadRequest.limit())));
         }
         else {
-            disconnect(m_reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(checkDownloadSize(qint64, qint64)));
+            disconnect(m_reply, &QNetworkReply::downloadProgress, this, &Net::DownloadHandler::checkDownloadSize);
         }
     }
-    else if (bytesReceived  > m_sizeLimit) {
+    else if (bytesReceived > m_downloadRequest.limit()) {
         m_reply->abort();
-        emit downloadFailed(m_url, msg.arg(Utils::Misc::friendlyUnit(bytesReceived)).arg(Utils::Misc::friendlyUnit(m_sizeLimit)));
+        emit downloadFailed(m_downloadRequest.url(), msg.arg(Utils::Misc::friendlyUnit(bytesReceived), Utils::Misc::friendlyUnit(m_downloadRequest.limit())));
     }
 }
 
-void DownloadHandler::init()
-{
-    m_reply->setParent(this);
-    if (m_sizeLimit > 0)
-        connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(checkDownloadSize(qint64, qint64)));
-    connect(m_reply, SIGNAL(finished()), this, SLOT(processFinishedDownload()));
-}
-
-bool DownloadHandler::saveToFile(const QByteArray &replyData, QString &filePath)
-{
-    QTemporaryFile *tmpfile = new QTemporaryFile(Utils::Fs::tempPath() + "XXXXXX");
-    if (!tmpfile->open()) {
-        delete tmpfile;
-        return false;
-    }
-
-    tmpfile->setAutoRemove(false);
-    filePath = tmpfile->fileName();
-    qDebug("Temporary filename is: %s", qUtf8Printable(filePath));
-    if (m_reply->isOpen() || m_reply->open(QIODevice::ReadOnly)) {
-        tmpfile->write(replyData);
-        tmpfile->close();
-        // XXX: tmpfile needs to be deleted on Windows before using the file
-        // or it will complain that the file is used by another process.
-        delete tmpfile;
-        return true;
-    }
-    else {
-        delete tmpfile;
-        Utils::Fs::forceRemove(filePath);
-    }
-
-    return false;
-}
-
-void DownloadHandler::handleRedirection(QUrl newUrl)
+void Net::DownloadHandler::handleRedirection(QUrl newUrl)
 {
     // Resolve relative urls
     if (newUrl.isRelative())
         newUrl = m_reply->url().resolved(newUrl);
 
     const QString newUrlString = newUrl.toString();
-    qDebug("Redirecting from %s to %s", qUtf8Printable(m_reply->url().toString()), qUtf8Printable(newUrlString));
+    qDebug("Redirecting from %s to %s...", qUtf8Printable(m_reply->url().toString()), qUtf8Printable(newUrlString));
 
     // Redirect to magnet workaround
     if (newUrlString.startsWith("magnet:", Qt::CaseInsensitive)) {
         qDebug("Magnet redirect detected.");
         m_reply->abort();
-        if (m_handleRedirectToMagnet)
-            emit redirectedToMagnet(m_url, newUrlString);
+        if (m_downloadRequest.handleRedirectToMagnet())
+            emit redirectedToMagnet(m_downloadRequest.url(), newUrlString);
         else
-            emit downloadFailed(m_url, tr("Unexpected redirect to magnet URI."));
+            emit downloadFailed(m_downloadRequest.url(), tr("Unexpected redirect to magnet URI."));
 
         this->deleteLater();
     }
     else {
-        DownloadHandler *tmp = m_manager->downloadUrl(newUrlString, m_saveToFile, m_sizeLimit, m_handleRedirectToMagnet);
-        m_reply->deleteLater();
-        m_reply = tmp->m_reply;
-        init();
-        tmp->m_reply = nullptr;
-        delete tmp;
+        DownloadHandler *redirected = m_manager->download(DownloadRequest(m_downloadRequest).url(newUrlString));
+        connect(redirected, &DownloadHandler::destroyed, this, &DownloadHandler::deleteLater);
+        connect(redirected, &DownloadHandler::downloadFailed, this, [this](const QString &, const QString &reason)
+        {
+            emit downloadFailed(url(), reason);
+        });
+        connect(redirected, &DownloadHandler::redirectedToMagnet, this, [this](const QString &, const QString &magnetUri)
+        {
+            emit redirectedToMagnet(url(), magnetUri);
+        });
+        connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QString &)>(&DownloadHandler::downloadFinished)
+                , this, [this](const QString &, const QString &fileName)
+        {
+            emit downloadFinished(url(), fileName);
+        });
+        connect(redirected, static_cast<void (DownloadHandler::*)(const QString &, const QByteArray &)>(&DownloadHandler::downloadFinished)
+                , this, [this](const QString &, const QByteArray &data)
+        {
+            emit downloadFinished(url(), data);
+        });
     }
 }
 
-QString errorCodeToString(QNetworkReply::NetworkError status)
+QString Net::DownloadHandler::errorCodeToString(const QNetworkReply::NetworkError status)
 {
     switch (status) {
     case QNetworkReply::HostNotFoundError:
-        return QObject::tr("The remote host name was not found (invalid hostname)");
+        return tr("The remote host name was not found (invalid hostname)");
     case QNetworkReply::OperationCanceledError:
-        return QObject::tr("The operation was canceled");
+        return tr("The operation was canceled");
     case QNetworkReply::RemoteHostClosedError:
-        return QObject::tr("The remote server closed the connection prematurely, before the entire reply was received and processed");
+        return tr("The remote server closed the connection prematurely, before the entire reply was received and processed");
     case QNetworkReply::TimeoutError:
-        return QObject::tr("The connection to the remote server timed out");
+        return tr("The connection to the remote server timed out");
     case QNetworkReply::SslHandshakeFailedError:
-        return QObject::tr("SSL/TLS handshake failed");
+        return tr("SSL/TLS handshake failed");
     case QNetworkReply::ConnectionRefusedError:
-        return QObject::tr("The remote server refused the connection");
+        return tr("The remote server refused the connection");
     case QNetworkReply::ProxyConnectionRefusedError:
-        return QObject::tr("The connection to the proxy server was refused");
+        return tr("The connection to the proxy server was refused");
     case QNetworkReply::ProxyConnectionClosedError:
-        return QObject::tr("The proxy server closed the connection prematurely");
+        return tr("The proxy server closed the connection prematurely");
     case QNetworkReply::ProxyNotFoundError:
-        return QObject::tr("The proxy host name was not found");
+        return tr("The proxy host name was not found");
     case QNetworkReply::ProxyTimeoutError:
-        return QObject::tr("The connection to the proxy timed out or the proxy did not reply in time to the request sent");
+        return tr("The connection to the proxy timed out or the proxy did not reply in time to the request sent");
     case QNetworkReply::ProxyAuthenticationRequiredError:
-        return QObject::tr("The proxy requires authentication in order to honor the request but did not accept any credentials offered");
+        return tr("The proxy requires authentication in order to honor the request but did not accept any credentials offered");
     case QNetworkReply::ContentAccessDenied:
-        return QObject::tr("The access to the remote content was denied (401)");
+        return tr("The access to the remote content was denied (401)");
     case QNetworkReply::ContentOperationNotPermittedError:
-        return QObject::tr("The operation requested on the remote content is not permitted");
+        return tr("The operation requested on the remote content is not permitted");
     case QNetworkReply::ContentNotFoundError:
-        return QObject::tr("The remote content was not found at the server (404)");
+        return tr("The remote content was not found at the server (404)");
     case QNetworkReply::AuthenticationRequiredError:
-        return QObject::tr("The remote server requires authentication to serve the content but the credentials provided were not accepted");
+        return tr("The remote server requires authentication to serve the content but the credentials provided were not accepted");
     case QNetworkReply::ProtocolUnknownError:
-        return QObject::tr("The Network Access API cannot honor the request because the protocol is not known");
+        return tr("The Network Access API cannot honor the request because the protocol is not known");
     case QNetworkReply::ProtocolInvalidOperationError:
-        return QObject::tr("The requested operation is invalid for this protocol");
+        return tr("The requested operation is invalid for this protocol");
     case QNetworkReply::UnknownNetworkError:
-        return QObject::tr("An unknown network-related error was detected");
+        return tr("An unknown network-related error was detected");
     case QNetworkReply::UnknownProxyError:
-        return QObject::tr("An unknown proxy-related error was detected");
+        return tr("An unknown proxy-related error was detected");
     case QNetworkReply::UnknownContentError:
-        return QObject::tr("An unknown error related to the remote content was detected");
+        return tr("An unknown error related to the remote content was detected");
     case QNetworkReply::ProtocolFailure:
-        return QObject::tr("A breakdown in protocol was detected");
+        return tr("A breakdown in protocol was detected");
     default:
-        return QObject::tr("Unknown error");
+        return tr("Unknown error");
     }
 }

src/base/net/downloadhandler.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -30,10 +30,11 @@
 #ifndef NET_DOWNLOADHANDLER_H
 #define NET_DOWNLOADHANDLER_H
 
+#include <QNetworkReply>
 #include <QObject>
 
-class QNetworkAccessManager;
-class QNetworkReply;
+#include "downloadmanager.h"
+
 class QUrl;
 
 namespace Net
@@ -43,10 +44,14 @@ namespace Net
     class DownloadHandler : public QObject
     {
         Q_OBJECT
+        Q_DISABLE_COPY(DownloadHandler)
+
+        friend class DownloadManager;
+
+        DownloadHandler(QNetworkReply *reply, DownloadManager *manager, const DownloadRequest &downloadRequest);
 
     public:
-        DownloadHandler(QNetworkReply *reply, DownloadManager *manager, bool saveToFile = false, qint64 limit = 0, bool handleRedirectToMagnet = false);
-        ~DownloadHandler();
+        ~DownloadHandler() override;
 
         QString url() const;
 
@@ -61,16 +66,14 @@ namespace Net
         void checkDownloadSize(qint64 bytesReceived, qint64 bytesTotal);
 
     private:
-        void init();
-        bool saveToFile(const QByteArray &replyData, QString &filePath);
+        void assignNetworkReply(QNetworkReply *reply);
         void handleRedirection(QUrl newUrl);
 
+        static QString errorCodeToString(QNetworkReply::NetworkError status);
+
         QNetworkReply *m_reply;
         DownloadManager *m_manager;
-        bool m_saveToFile;
-        qint64 m_sizeLimit;
-        bool m_handleRedirectToMagnet;
-        QString m_url;
+        const DownloadRequest m_downloadRequest;
     };
 }
 

src/base/net/downloadmanager.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -48,10 +48,10 @@ const char DEFAULT_USER_AGENT[] = "Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/
 
 namespace
 {
-    class NetworkCookieJar: public QNetworkCookieJar
+    class NetworkCookieJar : public QNetworkCookieJar
     {
     public:
-        explicit NetworkCookieJar(QObject *parent = 0)
+        explicit NetworkCookieJar(QObject *parent = nullptr)
             : QNetworkCookieJar(parent)
         {
             QDateTime now = QDateTime::currentDateTime();
@@ -103,91 +103,113 @@ namespace
             return QNetworkCookieJar::setCookiesFromUrl(cookies, url);
         }
     };
+
+    QNetworkRequest createNetworkRequest(const Net::DownloadRequest &downloadRequest)
+    {
+        QNetworkRequest request {downloadRequest.url()};
+
+        if (downloadRequest.userAgent().isEmpty())
+            request.setRawHeader("User-Agent", DEFAULT_USER_AGENT);
+        else
+            request.setRawHeader("User-Agent", downloadRequest.userAgent().toUtf8());
+
+        // Spoof HTTP Referer to allow adding torrent link from Torcache/KickAssTorrents
+        request.setRawHeader("Referer", request.url().toEncoded().data());
+        // Accept gzip
+        request.setRawHeader("Accept-Encoding", "gzip");
+
+        return request;
+    }
 }
 
-using namespace Net;
+Net::DownloadManager *Net::DownloadManager::m_instance = nullptr;
 
-DownloadManager *DownloadManager::m_instance = 0;
-
-DownloadManager::DownloadManager(QObject *parent)
+Net::DownloadManager::DownloadManager(QObject *parent)
     : QObject(parent)
 {
 #ifndef QT_NO_OPENSSL
-    connect(&m_networkManager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)), this, SLOT(ignoreSslErrors(QNetworkReply *, QList<QSslError>)));
+    connect(&m_networkManager, &QNetworkAccessManager::sslErrors, this, &Net::DownloadManager::ignoreSslErrors);
 #endif
+    connect(&m_networkManager, &QNetworkAccessManager::finished, this, &DownloadManager::handleReplyFinished);
+    connect(ProxyConfigurationManager::instance(), &ProxyConfigurationManager::proxyConfigurationChanged
+            , this, &DownloadManager::applyProxySettings);
     m_networkManager.setCookieJar(new NetworkCookieJar(this));
+    applyProxySettings();
 }
 
-void DownloadManager::initInstance()
+void Net::DownloadManager::initInstance()
 {
     if (!m_instance)
         m_instance = new DownloadManager;
 }
 
-void DownloadManager::freeInstance()
+void Net::DownloadManager::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
-DownloadManager *DownloadManager::instance()
+Net::DownloadManager *Net::DownloadManager::instance()
 {
     return m_instance;
 }
 
-DownloadHandler *DownloadManager::downloadUrl(const QString &url, bool saveToFile, qint64 limit, bool handleRedirectToMagnet, const QString &userAgent)
+Net::DownloadHandler *Net::DownloadManager::download(const DownloadRequest &downloadRequest)
 {
-    // Update proxy settings
-    applyProxySettings();
-
     // Process download request
-    qDebug("url is %s", qUtf8Printable(url));
-    const QUrl qurl = QUrl(url);
-    QNetworkRequest request(qurl);
+    const QNetworkRequest request = createNetworkRequest(downloadRequest);
+    const ServiceID id = ServiceID::fromURL(request.url());
+    const bool isSequentialService = m_sequentialServices.contains(id);
+    if (!isSequentialService || !m_busyServices.contains(id)) {
+        qDebug("Downloading %s...", qUtf8Printable(downloadRequest.url()));
+        if (isSequentialService)
+            m_busyServices.insert(id);
+        return new DownloadHandler {
+            m_networkManager.get(request), this, downloadRequest};
+    }
 
-    if (userAgent.isEmpty())
-        request.setRawHeader("User-Agent", DEFAULT_USER_AGENT);
-    else
-        request.setRawHeader("User-Agent", userAgent.toUtf8());
-
-    // Spoof HTTP Referer to allow adding torrent link from Torcache/KickAssTorrents
-    request.setRawHeader("Referer", request.url().toEncoded().data());
-
-    qDebug("Downloading %s...", request.url().toEncoded().data());
-    qDebug() << "Cookies:" << m_networkManager.cookieJar()->cookiesForUrl(request.url());
-    // accept gzip
-    request.setRawHeader("Accept-Encoding", "gzip");
-    return new DownloadHandler(m_networkManager.get(request), this, saveToFile, limit, handleRedirectToMagnet);
+    auto *downloadHandler = new DownloadHandler {nullptr, this, downloadRequest};
+    connect(downloadHandler, &DownloadHandler::destroyed, this, [this, id, downloadHandler]()
+    {
+        m_waitingJobs[id].removeOne(downloadHandler);
+    });
+    m_waitingJobs[id].enqueue(downloadHandler);
+    return downloadHandler;
 }
 
-QList<QNetworkCookie> DownloadManager::cookiesForUrl(const QUrl &url) const
+void Net::DownloadManager::registerSequentialService(const Net::ServiceID &serviceID)
+{
+    m_sequentialServices.insert(serviceID);
+}
+
+QList<QNetworkCookie> Net::DownloadManager::cookiesForUrl(const QUrl &url) const
 {
     return m_networkManager.cookieJar()->cookiesForUrl(url);
 }
 
-bool DownloadManager::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
+bool Net::DownloadManager::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
 {
     return m_networkManager.cookieJar()->setCookiesFromUrl(cookieList, url);
 }
 
-QList<QNetworkCookie> DownloadManager::allCookies() const
+QList<QNetworkCookie> Net::DownloadManager::allCookies() const
 {
     return static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->allCookies();
 }
 
-void DownloadManager::setAllCookies(const QList<QNetworkCookie> &cookieList)
+void Net::DownloadManager::setAllCookies(const QList<QNetworkCookie> &cookieList)
 {
     static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->setAllCookies(cookieList);
 }
 
-bool DownloadManager::deleteCookie(const QNetworkCookie &cookie)
+bool Net::DownloadManager::deleteCookie(const QNetworkCookie &cookie)
 {
     return static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->deleteCookie(cookie);
 }
 
-void DownloadManager::applyProxySettings()
+void Net::DownloadManager::applyProxySettings()
 {
     auto proxyManager = ProxyConfigurationManager::instance();
     ProxyConfiguration proxyConfig = proxyManager->proxyConfiguration();
@@ -208,7 +230,7 @@ void DownloadManager::applyProxySettings()
         }
         // Authentication?
         if (proxyManager->isAuthenticationRequired()) {
-            qDebug("Proxy requires authentication, authenticating");
+            qDebug("Proxy requires authentication, authenticating...");
             proxy.setUser(proxyConfig.username);
             proxy.setPassword(proxyConfig.password);
         }
@@ -220,11 +242,101 @@ void DownloadManager::applyProxySettings()
     m_networkManager.setProxy(proxy);
 }
 
+void Net::DownloadManager::handleReplyFinished(QNetworkReply *reply)
+{
+    const ServiceID id = ServiceID::fromURL(reply->url());
+    auto waitingJobsIter = m_waitingJobs.find(id);
+    if ((waitingJobsIter == m_waitingJobs.end()) || waitingJobsIter.value().isEmpty()) {
+        m_busyServices.remove(id);
+        return;
+    }
+
+    DownloadHandler *handler = waitingJobsIter.value().dequeue();
+    qDebug("Downloading %s...", qUtf8Printable(handler->m_downloadRequest.url()));
+    handler->assignNetworkReply(m_networkManager.get(createNetworkRequest(handler->m_downloadRequest)));
+    handler->disconnect(this);
+}
+
 #ifndef QT_NO_OPENSSL
-void DownloadManager::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
+void Net::DownloadManager::ignoreSslErrors(QNetworkReply *reply, const QList<QSslError> &errors)
 {
     Q_UNUSED(errors)
     // Ignore all SSL errors
     reply->ignoreSslErrors();
 }
 #endif
+
+Net::DownloadRequest::DownloadRequest(const QString &url)
+    : m_url {url}
+{
+}
+
+QString Net::DownloadRequest::url() const
+{
+    return m_url;
+}
+
+Net::DownloadRequest &Net::DownloadRequest::url(const QString &value)
+{
+    m_url = value;
+    return *this;
+}
+
+QString Net::DownloadRequest::userAgent() const
+{
+    return m_userAgent;
+}
+
+Net::DownloadRequest &Net::DownloadRequest::userAgent(const QString &value)
+{
+    m_userAgent = value;
+    return *this;
+}
+
+qint64 Net::DownloadRequest::limit() const
+{
+    return m_limit;
+}
+
+Net::DownloadRequest &Net::DownloadRequest::limit(qint64 value)
+{
+    m_limit = value;
+    return *this;
+}
+
+bool Net::DownloadRequest::saveToFile() const
+{
+    return m_saveToFile;
+}
+
+Net::DownloadRequest &Net::DownloadRequest::saveToFile(bool value)
+{
+    m_saveToFile = value;
+    return *this;
+}
+
+bool Net::DownloadRequest::handleRedirectToMagnet() const
+{
+    return m_handleRedirectToMagnet;
+}
+
+Net::DownloadRequest &Net::DownloadRequest::handleRedirectToMagnet(bool value)
+{
+    m_handleRedirectToMagnet = value;
+    return *this;
+}
+
+Net::ServiceID Net::ServiceID::fromURL(const QUrl &url)
+{
+    return {url.host(), url.port(80)};
+}
+
+uint Net::qHash(const ServiceID &serviceID, uint seed)
+{
+    return ::qHash(serviceID.hostName, seed) ^ serviceID.port;
+}
+
+bool Net::operator==(const ServiceID &lhs, const ServiceID &rhs)
+{
+    return ((lhs.hostName == rhs.hostName) && (lhs.port == rhs.port));
+}

src/base/net/downloadmanager.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -30,8 +30,12 @@
 #ifndef NET_DOWNLOADMANAGER_H
 #define NET_DOWNLOADMANAGER_H
 
-#include <QObject>
+#include <QHash>
 #include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QObject>
+#include <QQueue>
+#include <QSet>
 
 class QNetworkReply;
 class QNetworkCookie;
@@ -42,16 +46,57 @@ namespace Net
 {
     class DownloadHandler;
 
+    class DownloadRequest
+    {
+    public:
+        DownloadRequest(const QString &url);
+        DownloadRequest(const DownloadRequest &other) = default;
+
+        QString url() const;
+        DownloadRequest &url(const QString &value);
+
+        QString userAgent() const;
+        DownloadRequest &userAgent(const QString &value);
+
+        qint64 limit() const;
+        DownloadRequest &limit(qint64 value);
+
+        bool saveToFile() const;
+        DownloadRequest &saveToFile(bool value);
+
+        bool handleRedirectToMagnet() const;
+        DownloadRequest &handleRedirectToMagnet(bool value);
+
+    private:
+        QString m_url;
+        QString m_userAgent;
+        qint64 m_limit = 0;
+        bool m_saveToFile = false;
+        bool m_handleRedirectToMagnet = false;
+    };
+
+    struct ServiceID
+    {
+        QString hostName;
+        int port;
+
+        static ServiceID fromURL(const QUrl &url);
+    };
+
     class DownloadManager : public QObject
     {
         Q_OBJECT
+        Q_DISABLE_COPY(DownloadManager)
 
     public:
         static void initInstance();
         static void freeInstance();
         static DownloadManager *instance();
 
-        DownloadHandler *downloadUrl(const QString &url, bool saveToFile = false, qint64 limit = 0, bool handleRedirectToMagnet = false, const QString &userAgent = "");
+        DownloadHandler *download(const DownloadRequest &downloadRequest);
+
+        void registerSequentialService(const ServiceID &serviceID);
+
         QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
         bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
         QList<QNetworkCookie> allCookies() const;
@@ -60,17 +105,25 @@ namespace Net
 
     private slots:
     #ifndef QT_NO_OPENSSL
-        void ignoreSslErrors(QNetworkReply *,const QList<QSslError> &);
+        void ignoreSslErrors(QNetworkReply *, const QList<QSslError> &);
     #endif
 
     private:
-        explicit DownloadManager(QObject *parent = 0);
+        explicit DownloadManager(QObject *parent = nullptr);
 
         void applyProxySettings();
+        void handleReplyFinished(QNetworkReply *reply);
 
         static DownloadManager *m_instance;
         QNetworkAccessManager m_networkManager;
+
+        QSet<ServiceID> m_sequentialServices;
+        QSet<ServiceID> m_busyServices;
+        QHash<ServiceID, QQueue<DownloadHandler *>> m_waitingJobs;
     };
+
+    uint qHash(const ServiceID &serviceID, uint seed);
+    bool operator==(const ServiceID &lhs, const ServiceID &rhs);
 }
 
 #endif // NET_DOWNLOADMANAGER_H

src/base/net/geoipmanager.cpp

@@ -60,7 +60,7 @@ GeoIPManager::GeoIPManager()
     , m_geoIPDatabase(nullptr)
 {
     configure();
-    connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));
+    connect(Preferences::instance(), &Preferences::changed, this, &GeoIPManager::configure);
 }
 
 GeoIPManager::~GeoIPManager()
@@ -96,15 +96,14 @@ void GeoIPManager::loadDatabase()
     }
 
     QString filepath = Utils::Fs::expandPathAbs(
-                QString("%1%2/%3").arg(specialFolderLocation(SpecialFolder::Data))
-                .arg(GEOIP_FOLDER).arg(GEOIP_FILENAME));
+        QString("%1%2/%3").arg(specialFolderLocation(SpecialFolder::Data), GEOIP_FOLDER, GEOIP_FILENAME));
 
     QString error;
     m_geoIPDatabase = GeoIPDatabase::load(filepath, error);
     if (m_geoIPDatabase)
         Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.")
-                                       .arg(m_geoIPDatabase->type()).arg(m_geoIPDatabase->buildEpoch().toString()),
-                                       Log::INFO);
+            .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()),
+            Log::INFO);
     else
         Logger::instance()->addMessage(tr("Couldn't load GeoIP database. Reason: %1").arg(error), Log::WARNING);
 
@@ -119,9 +118,10 @@ void GeoIPManager::manageDatabaseUpdate()
 
 void GeoIPManager::downloadDatabaseFile()
 {
-    DownloadHandler *handler = DownloadManager::instance()->downloadUrl(DATABASE_URL);
-    connect(handler, SIGNAL(downloadFinished(QString, QByteArray)), SLOT(downloadFinished(QString, QByteArray)));
-    connect(handler, SIGNAL(downloadFailed(QString, QString)), SLOT(downloadFailed(QString, QString)));
+    DownloadHandler *handler = DownloadManager::instance()->download({DATABASE_URL});
+    connect(handler, static_cast<void (Net::DownloadHandler::*)(const QString &, const QByteArray &)>(&Net::DownloadHandler::downloadFinished)
+            , this, &GeoIPManager::downloadFinished);
+    connect(handler, &Net::DownloadHandler::downloadFailed, this, &GeoIPManager::downloadFailed);
 }
 
 QString GeoIPManager::lookup(const QHostAddress &hostAddr) const
@@ -432,13 +432,13 @@ void GeoIPManager::downloadFinished(const QString &url, QByteArray data)
                 delete m_geoIPDatabase;
             m_geoIPDatabase = geoIPDatabase;
             Logger::instance()->addMessage(tr("GeoIP database loaded. Type: %1. Build time: %2.")
-                                           .arg(m_geoIPDatabase->type()).arg(m_geoIPDatabase->buildEpoch().toString()),
-                                           Log::INFO);
+                .arg(m_geoIPDatabase->type(), m_geoIPDatabase->buildEpoch().toString()),
+                Log::INFO);
             QString targetPath = Utils::Fs::expandPathAbs(
                         specialFolderLocation(SpecialFolder::Data) + GEOIP_FOLDER);
             if (!QDir(targetPath).exists())
                 QDir().mkpath(targetPath);
-            QFile targetFile(QString("%1/%2").arg(targetPath).arg(GEOIP_FILENAME));
+            QFile targetFile(QString("%1/%2").arg(targetPath, GEOIP_FILENAME));
             if (!targetFile.open(QFile::WriteOnly) || (targetFile.write(data) == -1)) {
                 Logger::instance()->addMessage(
                             tr("Couldn't save downloaded GeoIP database file."), Log::WARNING);

src/base/net/portforwarder.cpp

@@ -36,7 +36,7 @@
 #include "base/logger.h"
 #include "base/settingsstorage.h"
 
-static const QString KEY_ENABLED = QLatin1String("Network/PortForwardingEnabled");
+static const QString KEY_ENABLED = QStringLiteral("Network/PortForwardingEnabled");
 
 namespace libt = libtorrent;
 using namespace Net;
@@ -121,8 +121,10 @@ void PortForwarder::start()
     settingsPack.set_bool(libt::settings_pack::enable_natpmp, true);
     m_provider->apply_settings(settingsPack);
 #endif
-    foreach (quint16 port, m_mappedPorts.keys())
-        m_mappedPorts[port] = m_provider->add_port_mapping(libt::session::tcp, port, port);
+    for (auto i = m_mappedPorts.begin(); i != m_mappedPorts.end(); ++i) {
+        // quint16 port = i.key();
+        i.value() = m_provider->add_port_mapping(libt::session::tcp, i.key(), i.key());
+    }
     m_active = true;
     Logger::instance()->addMessage(tr("UPnP / NAT-PMP support [ON]"), Log::INFO);
 }

src/base/net/private/geoipdatabase.cpp

@@ -26,25 +26,22 @@
  * exception statement from your version.
  */
 
-#include <QDebug>
-#include <QVariant>
-#include <QHash>
-#include <QHostAddress>
 #include <QDateTime>
+#include <QDebug>
 #include <QFile>
+#include <QHostAddress>
+#include <QVariant>
 
 #include "base/types.h"
 #include "geoipdatabase.h"
 
 namespace
 {
-    const quint32 __ENDIAN_TEST__ = 0x00000001;
-    const bool __IS_LITTLE_ENDIAN__ = (reinterpret_cast<const uchar *>(&__ENDIAN_TEST__)[0] == 0x01);
     const qint32 MAX_FILE_SIZE = 67108864; // 64MB
     const char DB_TYPE[] = "GeoLite2-Country";
     const quint32 MAX_METADATA_SIZE = 131072; // 128KB
     const char METADATA_BEGIN_MARK[] = "\xab\xcd\xefMaxMind.com";
-    const char DATA_SECTION_SEPARATOR[16] = { 0 };
+    const char DATA_SECTION_SEPARATOR[16] = {0};
 
     enum class DataType
     {
@@ -91,7 +88,7 @@ GeoIPDatabase::GeoIPDatabase(quint32 size)
 
 GeoIPDatabase *GeoIPDatabase::load(const QString &filename, QString &error)
 {
-    GeoIPDatabase *db = 0;
+    GeoIPDatabase *db = nullptr;
     QFile file(filename);
     if (file.size() > MAX_FILE_SIZE) {
         error = tr("Unsupported database file size.");
@@ -122,7 +119,7 @@ GeoIPDatabase *GeoIPDatabase::load(const QString &filename, QString &error)
 
 GeoIPDatabase *GeoIPDatabase::load(const QByteArray &data, QString &error)
 {
-    GeoIPDatabase *db = 0;
+    GeoIPDatabase *db = nullptr;
     if (data.size() > MAX_FILE_SIZE) {
         error = tr("Unsupported database file size.");
         return 0;
@@ -448,8 +445,12 @@ bool GeoIPDatabase::readDataFieldDescriptor(quint32 &offset, DataFieldDescriptor
 
 void GeoIPDatabase::fromBigEndian(uchar *buf, quint32 len) const
 {
-    if (__IS_LITTLE_ENDIAN__)
-        std::reverse(buf, buf + len);
+#if (Q_BYTE_ORDER == Q_LITTLE_ENDIAN)
+    std::reverse(buf, buf + len);
+#else
+    Q_UNUSED(buf);
+    Q_UNUSED(len);
+#endif
 }
 
 QVariant GeoIPDatabase::readMapValue(quint32 &offset, quint32 count) const

src/base/net/private/geoipdatabase.h

@@ -29,13 +29,13 @@
 #ifndef GEOIPDATABASE_H
 #define GEOIPDATABASE_H
 
-#include <QtGlobal>
 #include <QCoreApplication>
+#include <QtGlobal>
 
-class QHostAddress;
-class QString;
 class QByteArray;
 class QDateTime;
+class QHostAddress;
+class QString;
 
 struct DataFieldDescriptor;
 

src/base/net/proxyconfigurationmanager.cpp

@@ -27,9 +27,10 @@
  */
 
 #include "proxyconfigurationmanager.h"
+
 #include "base/settingsstorage.h"
 
-#define SETTINGS_KEY(name) "Network/Proxy/" name
+#define SETTINGS_KEY(name) QStringLiteral("Network/Proxy/" name)
 const QString KEY_ONLY_FOR_TORRENTS = SETTINGS_KEY("OnlyForTorrents");
 const QString KEY_TYPE = SETTINGS_KEY("Type");
 const QString KEY_IP = SETTINGS_KEY("IP");
@@ -80,7 +81,7 @@ void ProxyConfigurationManager::freeInstance()
 {
     if (m_instance) {
         delete m_instance;
-        m_instance = 0;
+        m_instance = nullptr;
     }
 }
 
@@ -135,18 +136,18 @@ void ProxyConfigurationManager::configureProxy()
     if (!m_isProxyOnlyForTorrents) {
         switch (m_config.type) {
         case ProxyType::HTTP_PW:
-            proxyStrHTTP = QString("http://%1:%2@%3:%4").arg(m_config.username)
-                    .arg(m_config.password).arg(m_config.ip).arg(m_config.port);
+            proxyStrHTTP = QString("http://%1:%2@%3:%4").arg(m_config.username
+                , m_config.password, m_config.ip, QString::number(m_config.port));
             break;
         case ProxyType::HTTP:
-            proxyStrHTTP = QString("http://%1:%2").arg(m_config.ip).arg(m_config.port);
+            proxyStrHTTP = QString("http://%1:%2").arg(m_config.ip, QString::number(m_config.port));
             break;
         case ProxyType::SOCKS5:
-            proxyStrSOCK = QString("%1:%2").arg(m_config.ip).arg(m_config.port);
+            proxyStrSOCK = QString("%1:%2").arg(m_config.ip, QString::number(m_config.port));
             break;
         case ProxyType::SOCKS5_PW:
-            proxyStrSOCK = QString("%1:%2@%3:%4").arg(m_config.username)
-                    .arg(m_config.password).arg(m_config.ip).arg(m_config.port);
+            proxyStrSOCK = QString("%1:%2@%3:%4").arg(m_config.username
+                , m_config.password, m_config.ip, QString::number(m_config.port));
             break;
         default:
             qDebug("Disabling HTTP communications proxy");

src/base/net/proxyconfigurationmanager.h

@@ -52,7 +52,7 @@ namespace Net
         QString password;
     };
 
-    class ProxyConfigurationManager: public QObject
+    class ProxyConfigurationManager : public QObject
     {
         Q_OBJECT
         Q_DISABLE_COPY(ProxyConfigurationManager)