Bump to 3.3.9

The QTBUG-52633 results in food of network interface changed events, libtorrent IP
rebind calls and flood in the qBt log. The work around is the check not only for
interface name, but for IP address on that interface before triggering the libtorrent rebind.

.appveyor.yml

@@ -9,8 +9,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: http://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: http://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-osx_image: xcode7
+osx_image: xcode7.3
 
 env:
   matrix:
@@ -30,10 +30,10 @@ notifications:
 
 # container-based builds
 #sudo: false
-# TODO: osx builder does not enable cache yet, see: https://github.com/travis-ci/travis-ci/issues/4011
-#cache:
-  #directories:
-    #- $HOME/.ccache
+cache:
+  ccache: true
+  directories:
+    - $HOME/hombebrew_cache
 
 # opt-in Ubuntu Trusty
 sudo: required
@@ -80,12 +80,6 @@ before_install:
   - if [ "$gui" = false ]; then qbtconf="$qbtconf --disable-gui" ; fi
   - |
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      # ccache
-      #if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
-        #dpkg-query -L ccache && export PATH="/usr/lib/ccache/:$PATH" && export use_ccache=true ;
-        #ccache -V && ccache --show-stats && ccache --zero-stats ;
-      #fi ;
-
       # setup virtual display for after_success target
       if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
     fi
@@ -117,27 +111,61 @@ install:
       # Qt
       if [ "$qt" = 4 ]; then sudo apt-get -qq install qt4-default libqt4-dev ; fi ;
       if [ "$qt" = 5 ]; then sudo apt-get -qq install qt5-default qtbase5-dev qttools5-dev-tools ; fi ;
+
+      # ccache
+      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+        dpkg-query -L ccache && export use_ccache=true ;
+        ccache -V && ccache --show-stats && ccache --zero-stats ;
+      fi ;
     fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      mkdir -p "$HOME/hombebrew_cache" ;
+      wget https://builds.shiki.hu/homebrew/version ;
+      if ! cmp --quiet "version" "$HOME/hombebrew_cache/version" ; then
+        echo "Cached files are different from server. Downloading new ones." ;
+        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.10.el_capitan.bottle.tar.gz ;
+      fi
+
       # dependencies
-      brew update > /dev/null && brew install colormake libtorrent-rasterbar ;
+      brew update > /dev/null ;
+      brew install colormake ccache ;
+      brew outdated "pkg-config" || brew upgrade "pkg-config" ;
+      # 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.10.el_capitan.bottle.tar.gz" "$(brew --cache)" ;
+      brew install "$HOME/hombebrew_cache/libtorrent-rasterbar.rb" ;
 
       # Qt
-      if [ "$qt" = 4 ]; then brew install qt ; fi ;
-      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 ; fi ;
+      if [ "$qt" = 4 ]; then brew install qt && ln -s /usr/local/Cellar/qt/4.8.7_2/plugins /usr/local ; fi ;
+      if [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 && ln -s /usr/local/Cellar/qt5/5.7.0/plugins /usr/local ; fi ;
+
+      # ccache
+      if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
+        export PATH="/usr/local/opt/ccache/libexec:$PATH" && export use_ccache=true ;
+        ccache -V && ccache --show-stats && ccache --zero-stats ;
+      fi ;
     fi
 
 script:
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # skip usual build when running coverity scan
   - cd "$TRAVIS_BUILD_DIR" && ./bootstrap.sh && ./configure $qbtconf
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs/' src/Makefile ; fi
+  - |
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      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 ;
+    fi
   - make && make install
 
 after_success:
   - if [ "$gui" = true ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cd "$qbt_path/bin" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/$qbt_exe.app/Contents/MacOS" ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cd "$TRAVIS_BUILD_DIR/src/" && macdeployqt "$qbt_exe.app" && cd "$qbt_exe.app/Contents/MacOS" ; fi
   - ./$qbt_exe --version
 
 after_script:

520EC6F6.asc

@@ -1,53 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2
-
-mQINBFb4b5EBEADTUsyDNPWdujfhx4ncy52MNdkw6EI8W7kxWypHCOr0EAcr9Xaq
-lGbstcu0v//f5E5Wvi7gNK7DJkgky4L1GKIufe61e9HXLI8Ekju0j1ojkgR8m4md
-BhIkQNB897xItKCYCtnHm/51dKxYDtSCdJ4a9RbfKyH6YqvM8R+s4jD472mvekHm
-lMeek+Tv85Thx2IR6NpUUaJZOUskhMpuhZDjLzI78ZWlnielxoGKysMke7iAekiL
-2scQYRmC/IrHIgf/mmaAvwJf82a3GqYRfC49RFBXaPAAGCJzu3WWqTrmLe9yRdB4
-HpQ6d8D28HpWfnLTfR9bkBHdy6/8dche4wCNbBXkvjoqMUTA7hgzPmJFW0GE8Omp
-SnFEj+8WVLCkBTp1zEdiYUzD30Itn/4YnzEQdExOnQRrKo5E9vLbdom8VXWrmO7v
-jXU4u8o9FDbYcMOmje2LFW1UQhP3pfMeIA/nKRfJivgz+76jtg3OU53tKKeHWHfa
-z88Mn+9QmBbC6l7/d308K9wlERwsv6uMFNrD1mIRIPW3Bvzgzc/nR/IfmIhizg+C
-vJvm1eAOnRTnMZAggW0dK65tclu3hL198IySvEcZ7TRdC6Wzqbzg+SgIn/JiWoKz
-dVAuGn4TD0D1R9SlGoGMFQUvHZAPsPCQHjyPsGwtxiqFJSvVE10id2lwSQARAQAB
-tG5zbGVkZ2VoYW1tZXI5OTkgKFVzZWQgZm9yIHNpZ25pbmcgcUJpdHRvcnJlbnQg
-c291cmNlIHRhcmJhbGxzIGFuZCBiaW5hcmllcy4pIDxzbGVkZ2VoYW1tZXI5OTlA
-cWJpdHRvcnJlbnQub3JnPokCNwQTAQgAIQUCVvhvkQIbAwULCQgHAgYVCAkKCwIE
-FgIDAQIeAQIXgAAKCRChrMrkUg7G9vW/EAC/A9yt5F3fW4yvLz3ZGPmWUQw1ah6B
-o8c8khCh9JATCTwoV+1ZAxEKMfFW8AQ52MwX34S45Fi1Ik860yD5Ea7HMg2dpq/1
-sZ1dK9LHVlSXHUTZi8dVUntxryz1hR5JS7UUvGtclHrjNTB1jkbiPN2LrcURg+K7
-WSJ+jaX9Wt6hzGwuAe4QqXQF1DRHK945hOe2by1VmV7IXtz4xXUIzVdbUI/fFuaV
-26ImAHKLuNRHO0DxGZX6f56T+zG+tEaERiHls8w7I3HIKAjTEHQwytB10tq/IRpK
-Rg1uDAutOIHe2Gm9XxOX5wwFiEGB0Dq2TxLjMZ42n/PaNk0JOvJkbmkM/NtInvOx
-xk807cpIgUf6CrBgavQ1DxSKL+OqowTQ3aNT1Cg8VI8yf0hOwXU/CyRe6o55+T8M
-d+FZk2eILJEeyJ1O7GdW8L7QK6vVIep/eFmuXkXE8kpnud9X84Fzh1mK7dzblWnS
-2SUB6vXQhnsIgGfp1maYLYVDK08BdSh4eg6kNVcyx/6/t8PUZjO5tDNhKflyddt/
-vRDxET8nULIKEct7g3X4w87klj9hxZzGz6zyv8JBdJYuwxfsZJ58M/vGZOrmdllb
-T9tC5AtcvaKLDulvkLzHvIgVCyk29fzGAJNb7pqoZP4oht8StTBlo+pVqfeE7m6/
-u45vAoX6l1sVlbkCDQRW+G+RARAAsR1sFdq8cUZUbYAiwP1ERdzKfhZx4qQCqUZs
-D1/fka7jttqAd2rCHWPtFmy2KTZVcNeWq9+9zG3jvykpapXhZ+r2/H13NE2FrTy8
-AcuQgCaXfnD6fR8cifJwSYeEDRZ6vJEuIv2Vn/ZJVkhM+M72LliNfkh/E+VIlybX
-OQm1sazCUAd+EMUT6/uEitJy3n2JlDK2ctkpO06pb647nC3dgtyU0aKto8ol3da3
-eWLzkoOzq9IQTHZ7x89ptVO+I8vR0itSV0Clt0Ab7AL3jwI8hZUvx5q3YmZrRrZy
-fmdhG61jyvaD9eM0dPZcmoLMEv23KaLHRY1+Mwf5a8kfzRgYQLimEsWt3NljmhQd
-04Fm1eTXBJ30TMSnJoIa0W1MQ36J7TFYxE44ySCL6uB2woHiqq6ydznbjtyTaHF7
-Fx2K2vZhHQT+V1B22XzuwBoVYqH4Q+Zw7f9yqDd1NU7+SwcUtapqqHM+OERRvR2s
-ddsttVMIC5e75MlhvRCvskm6yCxFYKnZLTIRW6W/xYfksXRwupk3TICRN9fmiDxx
-uZZRMurpV365kYowHUW2uY/dQTLazKCC1/folsmMIhqumhijkK81/vYSFPk3NmXi
-v6HljMCd0vmzJRdwzWgaLoFoazErmPiGkmQSup6BjJjE0CHldpvmLaGkWkbP7zWu
-VeYV79EAEQEAAYkCHwQYAQgACQUCVvhvkQIbDAAKCRChrMrkUg7G9hSQD/9WcAID
-FPTt/pcrVIGZ8/1EVrhuVlyC0UNKnZuCnbggr1UKs67ivhkv6lXBi4sS1VZoKUQZ
-xII+VnPzQGDDYUfkwExOSkZBqN0Tm3Ly1/xgAr46V4F6vZPs8D+fpvmXaHs4CrhA
-LVgWN3kYOtd5a5z0tomVLOKlh7iip0UBIx+j2CV2lqowL/OG7AXcq6iSbH4gEr7z
-G4wbPnRrvSqZ5oM0nGhXgYGG8HE4jaaRG6TBdWL6YcLKZmtueSIOGQAmqNwT3Vnw
-2kDfk+KNHQPTTZQ9KMUE/4c6mcoYIDDPo9POlf6ShvxipdLGKUFUz+MAkv5Oci4/
-I3RMnDdgfAzsppFlQ5IN3laipTcViPu9SLIzXcf1TMi4f9x3Lqm4r9x6KcLX8uC1
-ncOHqrqBnI5mm45EhJTahyFEGd+eTvsOSThdUEgkdRSln72cymh+iisdGSEMXinw
-nS/6WOYnW9a6s1J90ql7P/qA3sA7RA1AHRL5tKdYVM+2OFU1asLWRbdLVmQR2dgM
-3+0u3HBjkKd3/8iGcP1CfLvur9eh4FHkVYKIepz5ALBGdUQbc96p+Le4VFedvxDR
-Wz/9MJI/oK6ij90b6LF2eR47oTyYRGzaeMk4WjmHCqlK/mUABng9n+U3H2OzihYy
-x8m1+aYiYlKfcKWm1nKQG0hF04Axq5AYezjKvA==
-=Zdwm
------END PGP PUBLIC KEY BLOCK-----

5B7CC9A2.asc

@@ -0,0 +1,53 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQINBFcNIIwBEACpGHvHW9ku7rwCSc2Dv4gh3MO3HPoP7Ba4RiEKwa7SCbPzc0DL
+JypV4gNfnrpiO7bWVh5v+otbZTkQeNXWbx6hDUa2e5GCCuJifIu3PxpmMcNJFvvF
+nk5QRf6dtz4Sm2x6joYprvsEUjyk+wHC016/0g7yhc/w0sclXlpKK+8Pl5DFrf5C
+i5uljy3oJgl54D2yYAvxu3BrdTVKhLVYADUf1Fl3b5pV7VJwr+9wGuTqkORe1rpi
+9NGWXUaTmKF8+XAJxlbYIUOZQpQ02clFxz0T7o/+m74N8tK9j7g8H2Q3QwtKi0q1
+gI48LqI/EuZHIaRz/3pEVISlIpWzGqBL/G4I/UtzJLHyvySsqWXAKllKpk97XX77
+XxFy3VL3fR7o4IohAj5fD083X8tuBIP2dxmHzxHTWveKBlEV6C4MdtVRow8ia3lu
+RKLz6PF0hBBpebAP4MWAN8cy4ePBCe9BvyI2+3tPgqtlC2tEZLnRru6mtagPi4sj
+Yo/iFkSQdTXrxeyrMJh161gsWl16JeAfz4Dq8IBoUA1hXIjfM9FcIv1rCY6Y8JwS
+TtWMGYtzIcqE71wZxqnJuyFZkgC14NDTLgUwLf8XJOTWlMW9CY+tStjjw+sNoIPf
+p7YQCmss4p5J8flnxH4xJ8ogOHxENidA+Z/J9mtGjxXIXHavPlO3IEg/DwARAQAB
+tHFzbGVkZ2VoYW1tZXI5OTkgKFVzZWQgZm9yIHNpZ25pbmcgcUJpdHRvcnJlbnQg
+c291cmNlIHRhcmJhbGxzIGFuZCBiaW5hcmllcyB2Mi4pIDxzbGVkZ2VoYW1tZXI5
+OTlAcWJpdHRvcnJlbnQub3JnPokCNwQTAQgAIQUCVw0gjAIbAwULCQgHAgYVCAkK
+CwIEFgIDAQIeAQIXgAAKCRBuSi0CW3zJojB2D/0bKlelRDQDtWzfRyxrdhe5pgAt
+x1AsN/Cl7h8zlbAw38bL+jQ2/GmtzwzEqPfQc7IFnbeg0PZ58p7Hikj9h6JEhkyA
+1qekkriclUmblEwDne3TjPixqgoBfNcDQu74dT08XpM8auFQo31/jJ104903o0O5
++CPOPn2KTdwpcSpwAVIj/3H96gZWegJDNpdByJUVbzYCt1erJ6I0ZURKhzU1VTJj
+ZdEGB2YsvYpt5rsi41IYZZG33jMsPxSDDNJ/MiLXxkn08ZawNET6fnkEJJ37n9Pw
+82lTZjFEFU+KTMT7dNjIejWCRgHVLgW8sO2lCPqMiFfWymD/N3sFpBO+UI86y5ds
+hfGFAWcgSq9pVjuW4sbX3PntBnoNd+geDD1Ic4rP3jHRe5HuYGhtHO6xv/r7HeY5
+HiShCTSSDBJqFmhfjrCo0nISKnzyxgO/rY9vFlwXsKkTyL7s53ONkjwK34WmGnya
+tXdjBWShzAiTfF5hephfBSszmoBG2C8Jcu6P5n4buBY4RCsEa+6jE0R1vCtmpVwx
+WrXOeN2kGYMpAkPK1L69Le0FofgUDKlaFMv7KRl4R367xNRukYrsKwVlontJ+Y72
+X5t1BeRn8VSp0IzhssNXM8a4bTE8lvs889DOS2vgWEHIi0iyIesJYWPs4AKUw4rG
+EDwWxtTS0a7Rfx3DxLkCDQRXDSCMARAAqMIVJizEJp205c546IN75xeYiFszNXcs
+3768IY8bOoWj+rTwt2wIwtL/3O5K2dG79CSt2H5o6BPKmq43tOO60YW3Yk3m9BB/
+gnAVqk0QOPr5O8+yeBzdElU8CZh6y6zZMWugSkNmTDm6jZzPhgNjcjrit/dl9+0D
+GqJQcqoD8WzEWNcWrMHVz9cDewnLSVkwR758mZMaIiL7R10MZ++tNrC0j69UINqx
++9z1r1J07+NNnxqSTxVRcbjPYtM9E+tUiVFS2HPWN9ShVDkBAEdoWh90qzRaMiFl
+2NGNGOD1iHx/xr06RMeGEEXt2vhSlhfMW2YQW+UD2jzlFbARf53v39MUKKscGuIp
+BhxGw3JCq4l6qLW/bDkgnoXlOhZDmhQm6OpsjAyk9IEdd3ponSc7yYD3mUkJKR9e
+TaALD5t6TQGyNHakb4UfoXtE2RR78cbPlLIwag7eQ8GsNA+dfjowmOZdojx3ROsH
+ZdGQwb0YFLjuKAusA3TY+lCfbS6kzE2iI2DuaW+3dICcLrYuibbVb0CBNHyD+8KE
+tczdur/wm0lhqyVJkGyZKZT8C2cPxywKgy1Rn6F8Yfmj0Lna3nvtaZu0ZUS4/8Li
+t5PcOso1lSmYBuD6yq+GEAMCnUmn1Pm8eZRMlxxQuTPvyJKQrRDhbtAAr472MSno
+JKlS4SfaUF0AEQEAAYkCHwQYAQgACQUCVw0gjAIbDAAKCRBuSi0CW3zJomZDD/9I
+Jmzd5hiEzntlp84pyIJcfyIRe4KImvldAy6T02OSIbF1HzCNnwmqIPob6MOdMZ+K
+NwMK0htRkrRr/zM034+lBiWKZt+tVYHu49ioTYXEjAc5qDJE09Sq7HceQnhgE48f
+1n54XGT5G2w5gw+/a8Qn1SceE44VwXafL3E1gKaOrrsb1UH/AJhp+W4VMu+7bLXu
+7h1tN6v2PhvCYvBt3zyy8Q8xfJ2x7/D1lbF8ATJAiZ/km9x5bRm7OGRliVYaUe1n
+yR42fZOj3CBmAR0+lZLgjriqdMXrs+qlBbrmAhkn0XPQXAeaPifKoKIGDAUWIsqD
+HqM7imMGT+MR9APfSw8M4enOJWL+HnKpVBEARCEDpaFpJ3u7QRucFybpEhvIymoN
+ftyw+urId2Eg2K33NypeZo3M1K2LC65f2Ta7f/sZcIDUTbgW+m334fgVl1KptDA5
+DX3U9lTci7mi4uPuAFtbWrB1di4jYrxXYuzFm5g4xTb0Hw3kYIB6WXF+I7i0JaGO
+THxPC5X5lIAZrYrkxh+1n1Y1CY+TC8JcTzwORJIbFFm9tD/BHXa4849k4DVvFYCZ
+khq+/56FKZfoVByhB+x+2GaMlsBm1uPniO4lAakFPpIi0kaap4UVayQ/7ak+Bhsc
+AIHZUy6NtgZkuvW3xdpwp07LYo2ilhMI8RnzmtoRmg==
+=tDGM
+-----END PGP PUBLIC KEY BLOCK-----

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.2)
-cmake_policy(VERSION 3.2)
+cmake_minimum_required(VERSION 3.5)
+cmake_policy(VERSION 3.5)
 
 project(qBittorrent VERSION 3.4.0.0)
 

CODING_GUIDELINES.md

@@ -29,8 +29,10 @@ class MyOtherClass
 {
 public:
     //code
+    
 protected:
     //code
+    
 private:
     //code
 };
@@ -87,10 +89,14 @@ default:
 }
 ```
 
-#### d. single-line blocks (lambdas, initializer lists etc.) ####
+#### 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++
- {} // empty - space before {
- { body } // spaces around { and before }
+Class obj {}; // empty
+Class obj {expr};
+Class obj {expr1, /*...,*/ exprN};
+QVariantMap map {{"key1", 5}, {"key2", 10}};
 ```
 
 ### 2. If blocks ###
@@ -173,11 +179,11 @@ All names should be camelCased.
 #### a. Type names and namespaces ####
 Type names and namespaces start with Upper case letter (except POD types).
 ```c++
-class ClassName {}
+class ClassName {};
 
-struct StructName {}
+struct StructName {};
 
-enum EnumName {}
+enum EnumName {};
 
 typedef QList<ClassName> SomeList;
 
@@ -201,7 +207,40 @@ class MyClass
 }
 ```
 
-### 8. Misc.###
+### 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.
+
+The headers should be ordered alphabetically within each group (subgroup).<br/>
+<br/>
+Example:
+```c++
+// examplewidget.cpp
+
+#include "examplewidget.h"
+
+#include <cmath>
+#include <cstdio>
+
+#include <QDateTime>
+#include <QList>
+#include <QString>
+#include <QUrl>
+
+#include <libtorrent/version.hpp>
+
+#include "base/bittorrent/session.h"
+#include "base/bittorrent/infohash.h"
+#include "base/utils/fs.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "ui_examplewidget.h"
+
+```
+
+### 9. Misc.###
 
 * Line breaks for long lines with operation:
 
@@ -211,47 +250,18 @@ a += "b"
   + "d";
 ```
 
-* Initializers
-
-We allow brace enclosed initializers only for aggregates and arrays/containers.<br />
-Brace enclosed initializer MUST be used with equality sign if it follows the variable declaration.<br />
-Brace enclosed initializer MUST be additionally enclosed in parentheses if it is used in constructor initialization list.<br />
-Some valid use cases:
-```c++
-// aggregate
-Person john = { "John", "Smith", 21 };
-Person *john = new Person { "John", "Smith", 21 };
-
-// array
-int array[] = { 1, 2, 3, 4 };
-
-// container
-QHash<QString, QString> map = {
-    { "key1", "value1" },
-    { "key2", "value2" }
-);
-
-// member array
-SomeClass::SomeClass(BaseClass *parent)
-    : BaseClass(parent)
-    , m_someArrayMember({ 1, 2, 3, 4 })
-{
-}
-
-// return from function
-Person getPersonByName(const QString &name)
-{
-    // do something
-    return { name, surname, age };
-}
-
-// function argument
-doSomething({ name, surname, age }, someOtherArg);
-```
-
 * **auto** keyword
 
-We allow the use of the **auto** keyword only where it doesn't break the readability of the code (i.e. either we can gather enough information about the type from the right part of the expression, or we do not need to know the exact type), or where it is strictly necessary (for example, to compute the type of a lambda, etc.).<br />
+We allow the use of the **auto** keyword only where it is strictly necessary 
+(for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code.
+Declarations for which one can gather enough information about the object interface (type) from its name 
+or the usage pattern (an iterator or a loop variable are good examples of clear patterns) 
+or the right part of the expression nicely fit here.<br/>
+<br/>
+When weighing whether to use an auto-typed variable please think about potential reviewers of your code, 
+who will read it as a plain diff (on github.com, for instance). Please make sure that such reviewers can 
+understand the code completely and without excessive effort.<br/>
+<br/>
 Some valid use cases:
 ```c++
 template <typename List>
@@ -274,9 +284,17 @@ auto spinBox = static_cast<QSpinBox*>(sender());
 
 * Space around operations eg `a = b + c` or `a=b+c`:
 
-Before and after the assignment there should be a space. One exception could be: for loops.
+Before and after the assignment and other binary (and ternary) operators there should be a space.<br/>
+There should not be a space between increment/decrement and its operand.<br/>
+Some valid use cases:
 ```c++
-for (int a=0; a<b; ++b) {
+a += 20;
+a = (b <= MAX_B ? b : MAX_B);
+++a;
+b--;
+
+for (int a = 0; a < b; ++b) {
+    // code
 }
 ```
 
@@ -286,5 +304,5 @@ for (int a=0; a<b; ++b) {
 
 * Method definitions aren't allowed in header files
 
-### 9. Not covered above###
+###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.

COPYING

@@ -12,15 +12,15 @@ exception statement from your version.
 
 ----------
 
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -70,7 +70,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -269,7 +269,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -291,64 +291,4 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+                     END OF TERMS AND CONDITIONS

Changelog

@@ -1,3 +1,134 @@
+* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.9
+    - BUGFIX: Fix slider for per torrent speed limits when no global speed limit has been set. Closes #6046. (sledgehammer999)
+    - BUGFIX: Fix GUI for proxy settings. Closes #6045. (sledgehammer999)
+    - OSX: Correctly migrate settings/rss/usage stats in macOS. Closes #6041. (sledgehammer999)
+
+* Wed Dec 14 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.8
+    - FEATURE: Start using new libtorrent 1.1.x APIs (needs at least 1.1.2). Still unofficial support. (glassez, sledgehammer999)
+    - FEATURE: Add a new DHT bootstrap node run by libtorrent author arvidn. (sledgehammer999)
+    - FEATURE: Option to disable tracker's favicon download. (sledgehammer999)
+    - FEATURE: Shift + scroll = horizontal scroll. Closes #5980. Only for TransferListWidget, PeerListWidget. (Chocobo1)
+    - BUGFIX: Actually set new path as default when checkBox is enabled in Add New Torrent dialog. (erikssm)
+    - BUGFIX: Properly fix the handling of default save path store/load. (sledgehammer999)
+    - BUGFIX: Fix crash when restoring from tray. Closes #5854. (Chocobo1)
+    - BUGFIX: Export torrents added only after the setting was enabled. (sledgehammer999)
+    - BUGFIX: Delete old rss favicon before assigning new one. (sledgehammer999)
+    - BUGFIX: Don't revert save path value in the Dialog when metadata are received. Closes #5482. (sledgehammer999)
+    - BUGFIX: Don't ever stop seeding forced torrents. Closes #5784. (sledgehammer999)
+    - BUGFIX: Fix potential crash in TransferList widget. Closes #5873. (Chocobo1)
+    - BUGFIX: Sort torrent names case insensitively. (Yez Ezey)
+    - BUGFIX: Fix mistake in getting values for sorting in TransferList widget. (Anton Lashkov)
+    - BUGFIX: Fix memory leaks. (dzmat, Chocobo1)
+    - WEBUI: Fix webui port overflow. (thalieht)
+    - WEBUI: Changed meaning of the value of the 'dl_limit', 'up_limit', 'alt_dl_limit' and 'alt_up_limit' tokens. The value is expressed in bytes and not in KiB. (sledgehammer999)
+    - WEBUI: Don't request client SSL certificate. Closes #3883. (borouhin)
+    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 11.
+    - SEARCH: Fixed extratorrent search not working Closes #5736 #5753. (Yez Ezey)
+    - SEARCH: Update Demonoid plugin. (ngosang)
+    - SEARCH: Remove TorrentReactor plugin. (ngosang)
+    - SEARCH: Fix python auto install, deletion of installer and use 3.5.x series for Vista+. Closes #5871. (sledgehammer999)
+    - SEARCH: Set /usr/local/bin before default PATH on macOS. closes #5639 #5571. This enables finding newer python installs. (Yez Ezey)
+    - COSMETIC: Log: set embedded Tracker [OFF] msg type as info. (thalieht)
+    - COSMETIC: Remove (mostly) useless log warnings about tracker's favicon. (sledgehammer999)
+    - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
+    - OSX: Fix crash on exit using Qt4. (Yez Ezey)
+    - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
+    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
+    - OTHER: Turkish translation for installer. (Burak Yavuz)
+    - OTHER: Update portugueseBR for installer. (DaRKSoM)
+    - OTHER: Update portuguese for installer. (EdwardLinux)
+    - OTHER: Add --disable-qt-dbus to configure if $host_os is macOS. (Yez Ezey)
+    - OTHER: New translations: Icelandic, Latvian, Malay, Occitan, Uzbek.
+    - OTHER: A whole lot of code refactoring by various people.
+
+* Sun Sep 11 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.7
+    - FEATURE: Delete torrent+files with Shift+Delete (pieniacy)
+    - BUGFIX: Fix 6-hour speedplot point push rate. Close #5545 (Daniel Segesdi)
+    - BUGFIX: Avoid spawning a new explorer.exe process when selecting "Open containing folder". Closes #5564. (Chocobo1)
+    - BUGFIX: Fix loading of new geoip db due to an artificial size limit. (SagePtr)
+    - BUGFIX: Better error handling and logging with smtp communication. (Brian Kendall)
+    - SEARCH: Remove KickassTorrents search engine (ngosang)
+    - SEARCH: Remove BTDigg search engine (ngosang)
+    - SEARCH: Update Torrentz search engine (ngosang)
+    
+* Wed Jul 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.6
+    - BUGFIX: Do not create save folder in advance (glassez)
+    - BUGFIX: Fix upper-bound limit of command line for "Run External Program" in Windows. Closes #5399. (Chocobo1)
+    - BUGFIX: Invoke system's cmd.exe directly. (Chocobo1)
+    - BUGFIX: Workaround space issues in file path for running external program on Windows. (Chocobo1)
+    - BUGFIX: Fix icons are missing when using RTL languages in Options dialog. Closes #5398. (Chocobo1)
+
+* Mon Jun 20 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.5
+    - FEATURE: Implement Torrent Management Mode(TMM) (glassez)
+    - FEATURE: New cookies management dialog and various related fixes (glassez)
+    - FEATURE: Use unique temp directories (temp_path/<truncated_torrent_hash>). Closes #5154. (glassez)
+    - FEATURE: Display notifications when a torrent is added. Closes #334 and #915. (sledgehammer999)
+    - FEATURE: Sort labels with natural sort algorithm in the right-click menu. Closes #3919. (Chocobo1)
+    - 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: 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: 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)
+    - BUGFIX: Fix torrent adding with existing data (glassez)
+    - BUGFIX: Try to find incomplete files for new torrent (glassez)
+    - BUGFIX: Fix rechecking after torrent is finished (glassez)
+    - BUGFIX: Fix duplicate network interfaces. Closes #5131 (ngosang)
+    - BUGFIX: Fix .!qB extension is added when disabled (glassez)
+    - BUGFIX: Fix "IP Filtering - Apply to trackers" wasn't being applied. Closes #5217. (Chocobo1)
+    - BUGFIX: Don't resize the Country column needlessly (thalieht)
+    - BUGFIX: Fix crashing when exiting the program while the Options window was showing. Closes #4871, #5049. (Chocobo1)
+    - BUGFIX: Fix parsing of eMule .DAT filters. Closes #5281. (thalieht, sledgehammer999)
+    - WEBUI: Implement in setting/removing/showing categories. (buinsky)
+    - WEBUI: Add 'Added on' column in Webui. Closes #5145,#1092,#738 (Ibrahim Tachijian)
+    - WEBUI: Add command to get the logs (pmzqla)
+    - WEBUI: Expose Add trackers feature (pmzqla)
+    - WEBUI: Bump API_VERSION and API_VERSION_MIN to 10. (sledgehammer999)
+    - SEARCH: Implement search filters in the proxy model. (Eugene Shalygin)
+    - SEARCH: Optimize widgets inside of the search tab (Eugene Shalygin)
+    - SEARCH: Remove duplicated code from search tab and widget (Eugene Shalygin)
+    - SEARCH: Use nova2dl.py script instead of DownloadManager. Closes #5026. (glassez)
+    - SEARCH: Various UI cleanups and optimizations. (Chocobo1, ngosang)
+    - SEARCH: Fix Torrentz, Mininova, LegitTorrents, PirateBay plugins (ngosang)
+    - SEARCH: Fix toolbar resizing when m_searchFilter appears/disappears. Closes #5120. (Chocobo1)
+    - SEARCH: Use QPalette::LinkVisited color for downloaded items in search results (Eugene Shalygin)
+    - SEARCH: Update Python version requirements (min 2.7.9 / 3.3.0) (ngosang)
+    - SEARCH: Remove filters from Torrentreactor, BTDigg and Demonoid. It is done in the GUI now. (ngosang)
+    - RSS: default refresh interval to 30 mins (botmtl)
+    - COSMETIC: Improve TransferListDelegate::sizeHint (Chocobo1)
+    - COSMETIC: Fix long text clipping. Closes #5091. (Chocobo1)
+    - COSMETIC: Minor change in Stats dialog (ngosang)
+    - COSMETIC: Fix Update all button height in RSS tab (ngosang)
+    - COSMETIC: Disable `comboHideZero` when `checkHideZero` is unchecked. (Chocobo1)
+    - COSMETIC: Disable `checkLimituTPConnections` when `checkuTP` is unchecked. (Chocobo1)
+    - COSMETIC: Enable word wrap for "Run external program" help text (Chocobo1)
+    - COSMETIC: Fix mutually exclusive radio buttons can be unselected. (Chocobo1)
+    - COSMETIC: Set About tab font-size to default (zywo)
+    - COSMETIC: Improve wordings in "Auto download torrent" section (Chocobo1)
+    - COSMETIC: Change "Auto download torrent" default save path to "default location". (Chocobo1)
+    - COSMETIC: Change ambiguous text "Copy selected" to "Copy IP:port" (Chocobo1)
+    - COSMETIC: Improve error messages for "Auto download torrents" (Chocobo1)
+    - COSMETIC: Slim down 'Downloads' page of options window. (sledgehammer999)
+    - COSMETIC: Cleanup Connection page in Option dialog. Closes #845. (Chocobo1)
+    - COSMETIC: Fix reload button size is not the same size as "..." button in options dialog. (Chocobo1)
+    - WINDOWS: Let Windows handle all widgets scaling. (Chocobo1)
+    - WINDOWS: Improve stack trace for windows by including source filenames and line numbers (SeigneurSerpent)
+    - OSX: Fix qt5 bundle on OSX. Closes #4014. (sledgehammer999)
+    - OTHER: Make AddNewTorrentDialog behavior uniform (glassez)
+    - OTHER: Optimize the shutdown dialog (Chocobo1)
+    - 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: Fix gcc 6 compilation with qmake. See #5237. (sledgehammer999)
+
+
 * Tue Mar 29 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.4
     - FEATURE: Download more pieces in "Download first and last pieces first" feature (ngosang)
     - FEATURE: Unlock first column in peerlist too (thalieht)

README.md

@@ -29,8 +29,9 @@ will install and execute qBittorrent hopefully without any problem.
 
 ### Public key:
 Starting from v3.3.4 all source tarballs and binaries are signed.<br />
-The key currently used is 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
-You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/520EC6F6.asc).<br />
+The key currently used is 4096R/[5B7CC9A2](https://pgp.mit.edu/pks/lookup?op=get&search=0x6E4A2D025B7CC9A2) with fingerprint `D8F3DA77AAC6741053599C136E4A2D025B7CC9A2`.<br />
+You can also download it from [here](https://github.com/qbittorrent/qBittorrent/raw/master/5B7CC9A2.asc).<br />
+**PREVIOUSLY** the following key was used to sign the v3.3.4 source tarballs and v3.3.4 Windows installer **only**: 4096R/[520EC6F6](https://pgp.mit.edu/pks/lookup?op=get&search=0xA1ACCAE4520EC6F6) with fingerprint `F4A5FD201B117B1C2AB590E2A1ACCAE4520EC6F6`.<br />
 
 ### Misc:
 For more information please visit:

bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 aclocal -I m4
 autoconf

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -91,3 +91,16 @@ find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
 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)
+
+    set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
+        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}"
+        INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}"
+    )
+endif()

cmake/Modules/FindQtSingleApplication.cmake

@@ -79,3 +79,16 @@ ELSE (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)

cmake/Modules/QbtTargetSources.cmake

@@ -0,0 +1,17 @@
+# a helper function which appends source to the main qBt target
+# the target name is read from QBT_TARGET_NAME variable
+# sources file names are relative to the the ${qbt_executable_SOURCE_DIR}
+
+function (qbt_target_sources)
+    set (_sources_rel "")
+    foreach (_source IN ITEMS ${ARGN})
+        if (IS_ABSOLUTE "${_source}")
+            set(source_abs "${_source}")
+        else()
+            get_filename_component(_source_abs "${_source}" ABSOLUTE)
+        endif()
+        file (RELATIVE_PATH _source_rel "${qbt_executable_SOURCE_DIR}" "${_source_abs}")
+        list (APPEND _sources_rel "${_source_rel}")
+    endforeach()
+    target_sources (${QBT_TARGET_NAME} PRIVATE "${_sources_rel}")
+endfunction (qbt_target_sources)

conf.pri.in

@@ -6,8 +6,16 @@ DATADIR = @EXPAND_DATADIR@
 MANPREFIX = @EXPAND_MANDIR@
 
 QMAKE_CXXFLAGS += @QBT_CONF_EXTRA_CFLAGS@
-INCLUDEPATH += @QBT_CONF_INCLUDES@
-LIBS += @LDFLAGS@ @LIBS@
+
+EXTERNAL_INCLUDES = @QBT_CONF_INCLUDES@
+EXTERNAL_INCLUDES -= $$QMAKE_DEFAULT_INCDIRS
+# added /usr/local/include due to Qt 5.7.0 bug on macOS
+macx: EXTERNAL_INCLUDES += "/usr/local/include"
+INCLUDEPATH += $$EXTERNAL_INCLUDES
+
+EXTERNAL_LIBS = @LDFLAGS@ @LIBS@
+EXTERNAL_LIBS -= $$QMAKE_DEFAULT_LIBDIRS
+LIBS += $$EXTERNAL_LIBS
 
 CONFIG += @QBT_ADD_CONFIG@
 CONFIG -= @QBT_REMOVE_CONFIG@

configure

@@ -4257,6 +4257,17 @@ else
 $as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is macOS" >&5
+$as_echo_n "checking whether OS is macOS... " >&6; }
+if expr "$host_os" : ".*darwin.*" > /dev/null; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      enable_qt_dbus=no
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 # Require 0.23 pkg-config
 
 
@@ -5090,7 +5101,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 int
 main ()
 {
-boost::system::system_category
+boost::system::error_category *a = 0;
   ;
   return 0;
 }

configure.ac

@@ -67,6 +67,12 @@ AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
       LIBS="-lexecinfo $LIBS"],
       [AC_MSG_RESULT([no])])
 
+AC_MSG_CHECKING([whether OS is macOS])
+AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
+      [AC_MSG_RESULT([yes])
+      enable_qt_dbus=no],
+      [AC_MSG_RESULT([no])])
+
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
 AS_IF([test "x$PKG_CONFIG" = "x"],

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.4</string>
+	<string>3.3.9</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>

dist/windows/README.txt

@@ -1,12 +1,12 @@
 TRANSLATORS:
 
-1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will 
+1. Use an editor that has NSIS syntax highlighting(eg Notepad++/Geany). This will
    make your life easier.
-2. Open the relevant .nsi file that exists in the folder named 
+2. Open the relevant .nsi file that exists in the folder named
    "installer-translations"
-3. Lines starting with ";" are considered comments. These include the 
+3. Lines starting with ";" are considered comments. These include the
    english message to help you with the translation.
-4. Edit only the part inside the quotation marks(""). Unless you know 
+4. Edit only the part inside the quotation marks(""). Unless you know
    what you are doing.
 5. Save the files with utf8 encoding and BOM.
 6. Submit your changes: 1) as a pull request to the official git repo or
@@ -16,17 +16,13 @@ TRANSLATORS:
 PACKAGERS:
 
 You will need NSIS and upx to make the installer. You need a unicode version of NSIS.
-I tested with NSIS 3.0a0. 
+I tested with NSIS 3.0 (final).
 
 1. Open the options.nsi file in an editor and change line that contains
-   "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built. 
-2. Extract the plugins found in the folder "nsis plugins" into your 
+   "!define PROG_VERSION "3.0.3"" to the version of qbittorrent you just built.
+2. Extract the plugins found in the folder "nsis plugins" into your
    NSIS's unicode Plugin directory(usually C:\Program Files\NSIS\Plugins\x86-unicode).
-   Only the *.dll files are needed. Don't use the .dll from UAC.zip, use the one from "UAC Unicode.zip".
-   NOTE: To build the unicode version of UAC with MSVC2008 you need:
-    a) the sources from UAC.zip
-    b) apply the util.cpp.diff from "UAC Unicode.zip" to util.cpp
-    c) in a msvc command prompt issue: cl.exe /O1s /GS- /GR- /EHs-c- /Zl /LD /DUNICODE RunAs.cpp uac.cpp util.cpp /link kernel32.lib user32.lib shell32.lib advapi32.lib ole32.lib /DLL /MANIFEST:NO /OUT:uac.dll 
+   Only the *.dll files are needed. Use the unicode version of the dlls.
 3. The script you need to compile is "qbittorrent.nsi". It includes all other necessary scripts.
 4. The script expects the following file tree:
 
@@ -53,10 +49,11 @@ qbittorrent.exe
 qbittorrent.nsi
 qt.conf
 translations.nsi
+UAC.nsh
 uninstaller.nsi
 
 
-5. "license.txt" is a text file that contains the text rendered 
+5. "license.txt" is a text file that contains the text rendered
    from src\gui\gpl.html or the text contained in COPYING
 6. "qbittorrent.exe" is the compiled binary file.
 
@@ -64,7 +61,7 @@ SCRIPT HACKERS:
 
 If you add any new LangString variable to the scripts you NEED to provide
 "translations" of it to all the .nsi files inside "installer-translations.
-You can always leave the english string but you have to use all the LANG_<lang name> 
-for the given variable. Otherwise, if the user chooses a language that you 
-haven't provided a LANG_<lang name> for your variable then your string will be empty. 
+You can always leave the english string but you have to use all the LANG_<lang name>
+for the given variable. Otherwise, if the user chooses a language that you
+haven't provided a LANG_<lang name> for your variable then your string will be empty.
 Don't worry though, NSIS throws warnings for this when compiling the scripts.

dist/windows/UAC.nsh

@@ -228,6 +228,8 @@ pop $_LOGICLIB_TEMP
 !undef _UAC_ParseDefineFlags_orin_this
 !ifdef _UAC_ParseDefineFlags_orin_f1
 	!undef _UAC_ParseDefineFlags_orin_f1
+!endif
+!ifdef _UAC_ParseDefineFlags_orin_f2
 	!undef _UAC_ParseDefineFlags_orin_f2
 !endif
 !macroend

dist/windows/installer-translations/portuguese.nsi

@@ -17,7 +17,7 @@ LangString inst_firewallinfo ${LANG_PORTUGUESE} "Adicionando regra à firewall d
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_PORTUGUESE} "O qBittorrent está a ser executado. Feche a aplicação antes de instalar esta versão."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_PORTUGUESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_PORTUGUESE} "Uma antiga instalação foi encontrada.Essa mesma será desinstalada sem apagar as definições do usuário."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESE} "A desinstalar versão anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/portugueseBR.nsi

@@ -17,7 +17,7 @@ LangString inst_firewallinfo ${LANG_PORTUGUESEBR} "Adicionando regra no firewall
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_PORTUGUESEBR} "qBittorrent está rodando. Por favor feche a aplicação antes de instalar."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_PORTUGUESEBR} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_PORTUGUESEBR} "Uma instalação anterior foi detectada. Ela será desistalada sem deletar as configurações de usuário."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/turkish.nsi

@@ -1,51 +1,51 @@
 ;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_TURKISH} "qBittorrent (required)"
+LangString inst_qbt_req ${LANG_TURKISH} "qBittorrent (zorunlu)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_TURKISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_TURKISH} "Masaüstü Kısayolu oluştur"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_TURKISH} "Create Start Menu Shortcut"
+LangString inst_startmenu ${LANG_TURKISH} "Başlangıç Menüsü Kısayolu oluştur"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_TURKISH} "Open .torrent files with qBittorrent"
+LangString inst_torrent ${LANG_TURKISH} ".torrent dosyalarını qBittorrent ile aç"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_TURKISH} "Open magnet links with qBittorrent"
+LangString inst_magnet ${LANG_TURKISH} "Magnet bağlantılarını qBittorrent ile aç"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_TURKISH} "Add Windows Firewall rule"
+LangString inst_firewall ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı ekle"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_TURKISH} "Adding Windows Firewall rule"
+LangString inst_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı ekleniyor"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_TURKISH} "qBittorrent is running. Please close the application before installing."
+LangString inst_warning ${LANG_TURKISH} "qBittorrent çalışıyor. Lütfen yüklemeden önce uygulamayı kapatın."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
-LangString inst_uninstall_question ${LANG_TURKISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_TURKISH} "Önceki bir kurulum algılandı. Kullanıcı ayarları silinmeden kaldırılacaktır."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_TURKISH} "Uninstalling previous version."
+LangString inst_unist ${LANG_TURKISH} "Önceki sürüm kaldırılıyor."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_TURKISH} "Launch qBittorrent."
+LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i çalıştır."
 
 
 ;------------------------------------
 ;Uninstaller strings
 
 ;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_TURKISH} "Remove files"
+LangString remove_files ${LANG_TURKISH} "Dosyaları kaldır"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_TURKISH} "Remove shortcuts"
+LangString remove_shortcuts ${LANG_TURKISH} "Kısayolları kaldır"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_TURKISH} "Remove file associations"
+LangString remove_associations ${LANG_TURKISH} "Dosya ilişkilendirmelerini kaldır"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_TURKISH} "Remove registry keys"
+LangString remove_registry ${LANG_TURKISH} "Kayıt defteri anahtarlarını kaldır"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_TURKISH} "Remove configuration files"
+LangString remove_conf ${LANG_TURKISH} "Yapılandırma dosyalarını kaldır"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_TURKISH} "Remove Windows Firewall rule"
+LangString remove_firewall ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralını kaldır"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_TURKISH} "Removing Windows Firewall rule"
+LangString remove_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı kaldırılıyor"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_TURKISH} "Remove torrents and cached data"
+LangString remove_cache ${LANG_TURKISH} "Torrentleri ve önbelleklenen verileri kaldır"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_TURKISH} "qBittorrent is running. Please close the application before uninstalling."
+LangString uninst_warning ${LANG_TURKISH} "qBittorrent çalışıyor. Lütfen kaldırmadan önce uygulamayı kapatın."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_TURKISH} "Not removing .torrent association. It is associated with:"
+LangString uninst_tor_warn ${LANG_TURKISH} ".torrent ilişkilendirmesi kaldırılmıyor. Şununla ilişkilendirildi:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_TURKISH} "Not removing magnet association. It is associated with:"
+LangString uninst_mag_warn ${LANG_TURKISH} "Magnet ilişkilendirmesi kaldırılmıyor. Şununla ilişkilendirildi:"

dist/windows/installer.nsi

@@ -30,12 +30,13 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File "qbittorrent.pdb"
   File "qt.conf"
   File /oname=translations\qt_ar.qm "translations\qt_ar.qm"
+  File /oname=translations\qt_bg.qm "translations\qt_bg.qm"
   File /oname=translations\qt_ca.qm "translations\qt_ca.qm"
   File /oname=translations\qt_cs.qm "translations\qt_cs.qm"
   File /oname=translations\qt_da.qm "translations\qt_da.qm"
   File /oname=translations\qt_de.qm "translations\qt_de.qm"
-  File /oname=translations\qt_en.qm "translations\qt_en.qm"
   File /oname=translations\qt_es.qm "translations\qt_es.qm"
+  File /oname=translations\qt_eu.qm "translations\qt_eu.qm"
   File /oname=translations\qt_fa.qm "translations\qt_fa.qm"
   File /oname=translations\qt_fi.qm "translations\qt_fi.qm"
   File /oname=translations\qt_fr.qm "translations\qt_fr.qm"
@@ -46,15 +47,33 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File /oname=translations\qt_ja.qm "translations\qt_ja.qm"
   File /oname=translations\qt_ko.qm "translations\qt_ko.qm"
   File /oname=translations\qt_lt.qm "translations\qt_lt.qm"
+  File /oname=translations\qt_nl.qm "translations\qt_nl.qm"
   File /oname=translations\qt_pl.qm "translations\qt_pl.qm"
   File /oname=translations\qt_pt.qm "translations\qt_pt.qm"
+  File /oname=translations\qt_pt_BR.qm "translations\qt_pt_BR.qm"
   File /oname=translations\qt_ru.qm "translations\qt_ru.qm"
   File /oname=translations\qt_sk.qm "translations\qt_sk.qm"
   File /oname=translations\qt_sl.qm "translations\qt_sl.qm"
   File /oname=translations\qt_sv.qm "translations\qt_sv.qm"
+  File /oname=translations\qt_tr.qm "translations\qt_tr.qm"
   File /oname=translations\qt_uk.qm "translations\qt_uk.qm"
   File /oname=translations\qt_zh_CN.qm "translations\qt_zh_CN.qm"
   File /oname=translations\qt_zh_TW.qm "translations\qt_zh_TW.qm"
+  File /oname=translations\qtbase_ca.qm "translations\qtbase_ca.qm"
+  File /oname=translations\qtbase_cs.qm "translations\qtbase_cs.qm"
+  File /oname=translations\qtbase_de.qm "translations\qtbase_de.qm"
+  File /oname=translations\qtbase_fi.qm "translations\qtbase_fi.qm"
+  File /oname=translations\qtbase_fr.qm "translations\qtbase_fr.qm"
+  File /oname=translations\qtbase_he.qm "translations\qtbase_he.qm"
+  File /oname=translations\qtbase_hu.qm "translations\qtbase_hu.qm"
+  File /oname=translations\qtbase_it.qm "translations\qtbase_it.qm"
+  File /oname=translations\qtbase_ja.qm "translations\qtbase_ja.qm"
+  File /oname=translations\qtbase_ko.qm "translations\qtbase_ko.qm"
+  File /oname=translations\qtbase_lv.qm "translations\qtbase_lv.qm"
+  File /oname=translations\qtbase_pl.qm "translations\qtbase_pl.qm"
+  File /oname=translations\qtbase_ru.qm "translations\qtbase_ru.qm"
+  File /oname=translations\qtbase_sk.qm "translations\qtbase_sk.qm"
+  File /oname=translations\qtbase_uk.qm "translations\qtbase_uk.qm"
   
   ; Write the installation path into the registry  
   WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR"

dist/windows/options.nsi

@@ -19,7 +19,7 @@ XPStyle on
 !define CSIDL_APPDATA '0x1A' ;Application Data path
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
-!define PROG_VERSION "3.3.4"
+!define PROG_VERSION "3.3.9"
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
 !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)

dist/windows/qt.conf

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

dist/windows/uninstaller.nsi

@@ -6,12 +6,13 @@
   Delete "$INSTDIR\qbittorrent.pdb"
   Delete "$INSTDIR\qt.conf"  
   Delete "$INSTDIR\translations\qt_ar.qm"
+  Delete "$INSTDIR\translations\qt_bg.qm"
   Delete "$INSTDIR\translations\qt_ca.qm"
   Delete "$INSTDIR\translations\qt_cs.qm"
   Delete "$INSTDIR\translations\qt_da.qm"
   Delete "$INSTDIR\translations\qt_de.qm"
-  Delete "$INSTDIR\translations\qt_en.qm"
   Delete "$INSTDIR\translations\qt_es.qm"
+  Delete "$INSTDIR\translations\qt_eu.qm"
   Delete "$INSTDIR\translations\qt_fa.qm"
   Delete "$INSTDIR\translations\qt_fi.qm"
   Delete "$INSTDIR\translations\qt_fr.qm"
@@ -22,15 +23,33 @@
   Delete "$INSTDIR\translations\qt_ja.qm"
   Delete "$INSTDIR\translations\qt_ko.qm"
   Delete "$INSTDIR\translations\qt_lt.qm"
+  Delete "$INSTDIR\translations\qt_nl.qm"
   Delete "$INSTDIR\translations\qt_pl.qm"
+  Delete "$INSTDIR\translations\qt_pt_BR.qm"
   Delete "$INSTDIR\translations\qt_pt.qm"
   Delete "$INSTDIR\translations\qt_ru.qm"
   Delete "$INSTDIR\translations\qt_sk.qm"
   Delete "$INSTDIR\translations\qt_sl.qm"
   Delete "$INSTDIR\translations\qt_sv.qm"
+  Delete "$INSTDIR\translations\qt_tr.qm"
   Delete "$INSTDIR\translations\qt_uk.qm"
   Delete "$INSTDIR\translations\qt_zh_CN.qm"
   Delete "$INSTDIR\translations\qt_zh_TW.qm"
+  Delete "$INSTDIR\translations\qtbase_ca.qm"
+  Delete "$INSTDIR\translations\qtbase_cs.qm"
+  Delete "$INSTDIR\translations\qtbase_de.qm"
+  Delete "$INSTDIR\translations\qtbase_fi.qm"
+  Delete "$INSTDIR\translations\qtbase_fr.qm"
+  Delete "$INSTDIR\translations\qtbase_he.qm"
+  Delete "$INSTDIR\translations\qtbase_hu.qm"
+  Delete "$INSTDIR\translations\qtbase_it.qm"
+  Delete "$INSTDIR\translations\qtbase_ja.qm"
+  Delete "$INSTDIR\translations\qtbase_ko.qm"
+  Delete "$INSTDIR\translations\qtbase_lv.qm"
+  Delete "$INSTDIR\translations\qtbase_pl.qm"
+  Delete "$INSTDIR\translations\qtbase_ru.qm"
+  Delete "$INSTDIR\translations\qtbase_sk.qm"
+  Delete "$INSTDIR\translations\qtbase_uk.qm"
   Delete "$INSTDIR\uninst.exe"
   
   ; Remove directories used  

m4/ax_boost_system.m4

@@ -31,7 +31,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 17
+#serial 18
 
 AC_DEFUN([AX_BOOST_SYSTEM],
 [
@@ -68,9 +68,10 @@ AC_DEFUN([AX_BOOST_SYSTEM],
 					   ax_cv_boost_system,
         [AC_LANG_PUSH([C++])
 			 CXXFLAGS_SAVE=$CXXFLAGS
+			 CXXFLAGS=
 
 			 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/system/error_code.hpp>]],
-                                   [[boost::system::system_category]])],
+				    [[boost::system::error_category *a = 0;]])],
                    ax_cv_boost_system=yes, ax_cv_boost_system=no)
 			 CXXFLAGS=$CXXFLAGS_SAVE
              AC_LANG_POP([C++])

macxconf.pri

@@ -34,6 +34,8 @@ qt_translations.files = \
     $$QT_LANG_PATH/qt_da.qm \
     $$QT_LANG_PATH/qt_de.qm \
     $$QT_LANG_PATH/qt_es.qm \
+    $$QT_LANG_PATH/qt_eu.qm \
+    $$QT_LANG_PATH/qt_fa.qm \
     $$QT_LANG_PATH/qt_fi.qm \
     $$QT_LANG_PATH/qt_fr.qm \
     $$QT_LANG_PATH/qt_gl.qm \
@@ -49,11 +51,27 @@ qt_translations.files = \
     $$QT_LANG_PATH/qt_pt_BR.qm \
     $$QT_LANG_PATH/qt_ru.qm \
     $$QT_LANG_PATH/qt_sk.qm \
+    $$QT_LANG_PATH/qt_sl.qm \
     $$QT_LANG_PATH/qt_sv.qm \
     $$QT_LANG_PATH/qt_tr.qm \
     $$QT_LANG_PATH/qt_uk.qm \
     $$QT_LANG_PATH/qt_zh_CN.qm \
-    $$QT_LANG_PATH/qt_zh_TW.qm
+    $$QT_LANG_PATH/qt_zh_TW.qm \
+    $$QT_LANG_PATH/qtbase_ca.qm \
+    $$QT_LANG_PATH/qtbase_cs.qm \
+    $$QT_LANG_PATH/qtbase_de.qm \
+    $$QT_LANG_PATH/qtbase_fi.qm \
+    $$QT_LANG_PATH/qtbase_fr.qm \
+    $$QT_LANG_PATH/qtbase_he.qm \
+    $$QT_LANG_PATH/qtbase_hu.qm \
+    $$QT_LANG_PATH/qtbase_it.qm \
+    $$QT_LANG_PATH/qtbase_ja.qm \
+    $$QT_LANG_PATH/qtbase_ko.qm \
+    $$QT_LANG_PATH/qtbase_lv.qm \
+    $$QT_LANG_PATH/qtbase_pl.qm \
+    $$QT_LANG_PATH/qtbase_ru.qm \
+    $$QT_LANG_PATH/qtbase_sk.qm \
+    $$QT_LANG_PATH/qtbase_uk.qm
 QMAKE_BUNDLE_DATA += qt_translations
 
 ICON = $$DIST_PATH/qbittorrent_mac.icns

src/CMakeLists.txt

@@ -3,15 +3,9 @@ set(CMAKE_CXX_STANDARD "11")
 add_definitions(-DBOOST_NO_CXX11_RVALUE_REFERENCES)
 
 include(MacroLinkQtComponents)
+include(QbtTargetSources)
 
 find_package(LibtorrentRasterbar REQUIRED)
-include_directories(SYSTEM ${LibtorrentRasterbar_INCLUDE_DIRS})
-add_compile_options(${LibtorrentRasterbar_DEFINITIONS})
-
-# Boost
-set(Boost_USE_MULTITHREADED ON)
-find_package(Boost 1.35 REQUIRED COMPONENTS system)
-include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 # Qt
 if (QT5)
@@ -88,16 +82,22 @@ set(QBT_USES_QT5 ${QT5})
 
 configure_file(config.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+if (GUI)
+    set(QBT_TARGET_NAME qbittorrent)
+else (GUI)
+    set(QBT_TARGET_NAME qbittorrent-nox)
+endif (GUI)
 
-add_subdirectory(base)
 
 if (SYSTEM_QTSINGLEAPPLICATION)
     find_package(QtSingleApplication REQUIRED)
-    include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIR})
 else (SYSTEM_QTSINGLEAPPLICATION)
-    include_directories(app/qtsingleapplication)
+    add_subdirectory(app/qtsingleapplication)
 endif (SYSTEM_QTSINGLEAPPLICATION)
 
+add_subdirectory(app)
+add_subdirectory(base)
+
 if (GUI)
     add_subdirectory(gui)
 endif (GUI)
@@ -106,4 +106,3 @@ if (WEBUI)
     add_subdirectory(webui)
 endif (WEBUI)
 
-add_subdirectory(app)

src/app/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(qbt_executable)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(QBT_APP_HEADERS
@@ -86,13 +87,10 @@ list(APPEND QBT_APP_HEADERS upgrade.h)
 list(APPEND QBT_TARGET_LIBRARIES qbt_base)
 
 if (GUI)
-    set(QBT_TARGET_NAME qbittorrent)
     list(APPEND QBT_TARGET_LIBRARIES qbt_searchengine qbt_gui)
     include_directories(../gui
         ${CMAKE_CURRENT_BINARY_DIR}/../gui
     )
-else (GUI)
-    set(QBT_TARGET_NAME qbittorrent-nox)
 endif (GUI)
 
 if (WEBUI)
@@ -152,6 +150,7 @@ add_executable(${QBT_TARGET_NAME} ${QBT_APP_HEADERS} ${QBT_APP_SOURCES} ${QBT_QM
 set_target_properties(${QBT_TARGET_NAME}
     PROPERTIES
         AUTOUIC True
+        AUTORCC True
         MACOSX_BUNDLE True
 )
 
@@ -159,14 +158,7 @@ if (GUI AND WIN32)
     set_target_properties(${QBT_TARGET_NAME} PROPERTIES WIN32_EXECUTABLE True)
 endif (GUI AND WIN32)
 
-target_link_libraries(${QBT_TARGET_NAME} ${QBT_TARGET_LIBRARIES})
-
-if (SYSTEM_QTSINGLEAPPLICATION)
-    target_link_libraries(${QBT_TARGET_NAME} ${QTSINGLEAPPLICATION_LIBRARIES})
-else (SYSTEM_QTSINGLEAPPLICATION)
-    add_subdirectory(qtsingleapplication)
-    target_link_libraries(${QBT_TARGET_NAME} qtsingleapplication)
-endif (SYSTEM_QTSINGLEAPPLICATION)
+target_link_libraries(${QBT_TARGET_NAME} ${QBT_TARGET_LIBRARIES} QtSingleApplication::QtSingleApplication)
 
 if (APPLE)
     set(qbt_BUNDLE_NAME "${CMAKE_PROJECT_NAME}")

src/app/application.cpp

@@ -33,6 +33,7 @@
 #include <QLibraryInfo>
 #include <QSysInfo>
 #include <QProcess>
+#include <QAtomicInt>
 
 #ifndef DISABLE_GUI
 #include "gui/guiiconprovider.h"
@@ -48,7 +49,7 @@
 #endif // Q_OS_MAC
 #include "mainwindow.h"
 #include "addnewtorrentdialog.h"
-#include "shutdownconfirm.h"
+#include "shutdownconfirmdlg.h"
 #else // DISABLE_GUI
 #include <iostream>
 #endif // DISABLE_GUI
@@ -61,6 +62,7 @@
 #include "filelogger.h"
 #include "base/logger.h"
 #include "base/preferences.h"
+#include "base/settingsstorage.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/iconprovider.h"
@@ -68,19 +70,38 @@
 #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"
 
-static const char PARAMS_SEPARATOR[] = "|";
+namespace
+{
+#define SETTINGS_KEY(name) "Application/" name
+
+    // FileLogger properties keys
+#define FILELOGGER_SETTINGS_KEY(name) 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_AGE = FILELOGGER_SETTINGS_KEY("Age");
+    const QString KEY_FILELOGGER_AGETYPE = FILELOGGER_SETTINGS_KEY("AgeType");
+
+    //just a shortcut
+    inline SettingsStorage *settings() { return  SettingsStorage::instance(); }
+
+    const QString LOG_FOLDER("logs");
+    const char PARAMS_SEPARATOR[] = "|";
+}
 
 Application::Application(const QString &id, int &argc, char **argv)
     : BaseApplication(id, argc, argv)
     , m_running(false)
-#ifndef DISABLE_GUI
-    , m_shutdownAct(ShutdownAction::None)
-#endif
+    , m_shutdownAct(ShutdownDialogAction::Exit)
 {
     Logger::initInstance();
+    SettingsStorage::initInstance();
     Preferences::initInstance();
 
 #if defined(Q_OS_MACX) && !defined(DISABLE_GUI)
@@ -104,20 +125,111 @@ Application::Application(const QString &id, int &argc, char **argv)
 
     connect(this, SIGNAL(messageReceived(const QString &)), SLOT(processMessage(const QString &)));
     connect(this, SIGNAL(aboutToQuit()), SLOT(cleanup()));
-    connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));
 
-    configure();
+    if (isFileLoggerEnabled())
+        m_fileLogger = new FileLogger(fileLoggerPath(), isFileLoggerBackup(), fileLoggerMaxSize(), isFileLoggerDeleteOld(), fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
+
     Logger::instance()->addMessage(tr("qBittorrent %1 started", "qBittorrent v3.2.0alpha started").arg(VERSION));
 }
 
-void Application::configure()
+#ifndef DISABLE_GUI
+QPointer<MainWindow> Application::mainWindow()
 {
-    bool fileLogEnabled = Preferences::instance()->fileLogEnabled();
+    return m_window;
+}
+#endif
 
-    if (fileLogEnabled && !m_fileLogger)
-        m_fileLogger = new FileLogger;
-    else if (!fileLogEnabled)
+bool Application::isFileLoggerEnabled() const
+{
+    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true).toBool();
+}
+
+void Application::setFileLoggerEnabled(bool value)
+{
+    if (value && !m_fileLogger)
+        m_fileLogger = new FileLogger(fileLoggerPath(), isFileLoggerBackup(), fileLoggerMaxSize(), isFileLoggerDeleteOld(), fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
+    else if (!value)
         delete m_fileLogger;
+    settings()->storeValue(KEY_FILELOGGER_ENABLED, value);
+}
+
+QString Application::fileLoggerPath() const
+{
+    return settings()->loadValue(KEY_FILELOGGER_PATH, QVariant(Utils::Fs::QDesktopServicesDataLocation() + LOG_FOLDER)).toString();
+}
+
+void Application::setFileLoggerPath(const QString &value)
+{
+    if (m_fileLogger)
+        m_fileLogger->changePath(value);
+    settings()->storeValue(KEY_FILELOGGER_PATH, value);
+}
+
+bool Application::isFileLoggerBackup() const
+{
+    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true).toBool();
+}
+
+void Application::setFileLoggerBackup(bool value)
+{
+    if (m_fileLogger)
+        m_fileLogger->setBackup(value);
+    settings()->storeValue(KEY_FILELOGGER_BACKUP, value);
+}
+
+bool Application::isFileLoggerDeleteOld() const
+{
+    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true).toBool();
+}
+
+void Application::setFileLoggerDeleteOld(bool value)
+{
+    if (value && m_fileLogger)
+        m_fileLogger->deleteOld(fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
+    settings()->storeValue(KEY_FILELOGGER_DELETEOLD, 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;
+}
+
+void Application::setFileLoggerMaxSize(const int value)
+{
+    if (m_fileLogger)
+        m_fileLogger->setMaxSize(value);
+    settings()->storeValue(KEY_FILELOGGER_MAXSIZE, std::min(std::max(value, 1), 1000));
+}
+
+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;
+}
+
+void Application::setFileLoggerAge(const int value)
+{
+    settings()->storeValue(KEY_FILELOGGER_AGE, std::min(std::max(value, 1), 365));
+}
+
+int Application::fileLoggerAgeType() const
+{
+    int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1).toInt();
+    return (val < 0 || val > 2) ? 1 : val;
+}
+
+void Application::setFileLoggerAgeType(const int value)
+{
+    settings()->storeValue(KEY_FILELOGGER_AGETYPE, (value < 0 || value > 2) ? 1 : value);
 }
 
 void Application::processMessage(const QString &message)
@@ -131,6 +243,50 @@ void Application::processMessage(const QString &message)
         m_paramsQueue.append(params);
 }
 
+void Application::runExternalProgram(BitTorrent::TorrentHandle *const torrent) const
+{
+    QString program = Preferences::instance()->getAutoRunProgram();
+    program.replace("%N", torrent->name());
+    program.replace("%L", torrent->category());
+    program.replace("%F", Utils::Fs::toNativePath(torrent->contentPath()));
+    program.replace("%R", Utils::Fs::toNativePath(torrent->rootPath()));
+    program.replace("%D", Utils::Fs::toNativePath(torrent->savePath()));
+    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));
+
+#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;
+    }
+
+    STARTUPINFOW si = {0};
+    si.cb = sizeof(si);
+    PROCESS_INFORMATION pi = {0};
+
+    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;
+#else
+    QProcess::startDetached(program);
+#endif
+}
+
 void Application::sendNotificationEmail(BitTorrent::TorrentHandle *const torrent)
 {
     // Prepare mail content
@@ -155,75 +311,58 @@ void Application::torrentFinished(BitTorrent::TorrentHandle *const torrent)
     Preferences *const pref = Preferences::instance();
 
     // AutoRun program
-    if (pref->isAutoRunEnabled()) {
-        QString program = pref->getAutoRunProgram();
-
-        program.replace("%N", torrent->name());
-        program.replace("%L", torrent->label());
-        program.replace("%F", Utils::Fs::toNativePath(torrent->contentPath()));
-        program.replace("%R", Utils::Fs::toNativePath(torrent->rootPath()));
-        program.replace("%D", Utils::Fs::toNativePath(torrent->savePath()));
-        program.replace("%C", QString::number(torrent->filesCount()));
-        program.replace("%Z", QString::number(torrent->totalSize()));
-        program.replace("%T", torrent->currentTracker());
-        program.replace("%I", torrent->hash());
-
-        QProcess::startDetached(program);
-    }
+    if (pref->isAutoRunEnabled())
+        runExternalProgram(torrent);
 
     // Mail notification
-    if (pref->isMailNotificationEnabled())
+    if (pref->isMailNotificationEnabled()) {
+        Logger::instance()->addMessage(tr("Torrent: %1, sending mail notification").arg(torrent->name()));
         sendNotificationEmail(torrent);
+    }
 }
 
 void Application::allTorrentsFinished()
 {
-#ifndef DISABLE_GUI
     Preferences *const pref = Preferences::instance();
+    bool isExit = pref->shutdownqBTWhenDownloadsComplete();
+    bool isShutdown = pref->shutdownWhenDownloadsComplete();
+    bool isSuspend = pref->suspendWhenDownloadsComplete();
+    bool isHibernate = pref->hibernateWhenDownloadsComplete();
 
-    bool will_shutdown = (pref->shutdownWhenDownloadsComplete()
-                          || pref->shutdownqBTWhenDownloadsComplete()
-                          || pref->suspendWhenDownloadsComplete()
-                          || pref->hibernateWhenDownloadsComplete());
+    bool haveAction = isExit || isShutdown || isSuspend || isHibernate;
+    if (!haveAction) return;
 
-    // Auto-Shutdown
-    if (will_shutdown) {
-        bool suspend = pref->suspendWhenDownloadsComplete();
-        bool hibernate = pref->hibernateWhenDownloadsComplete();
-        bool shutdown = pref->shutdownWhenDownloadsComplete();
+    ShutdownDialogAction action = ShutdownDialogAction::Exit;
+    if (isSuspend)
+        action = ShutdownDialogAction::Suspend;
+    else if (isHibernate)
+        action = ShutdownDialogAction::Hibernate;
+    else if (isShutdown)
+        action = ShutdownDialogAction::Shutdown;
 
-        // Confirm shutdown
-        ShutdownAction action = ShutdownAction::None;
-        if (suspend)
-            action = ShutdownAction::Suspend;
-        else if (hibernate)
-            action = ShutdownAction::Hibernate;
-        else if (shutdown)
-            action = ShutdownAction::Shutdown;
-
-        if ((action == ShutdownAction::None) && (!pref->dontConfirmAutoExit())) {
-            if (!ShutdownConfirmDlg::askForConfirmation(action))
-                return;
-        }
-        else { //exit and shutdown
-            if (!ShutdownConfirmDlg::askForConfirmation(action))
-                return;
-        }
-
-        // Actually shut down
-        if (suspend || hibernate || shutdown) {
-            qDebug("Preparing for auto-shutdown because all downloads are complete!");
-            // Disabling it for next time
-            pref->setShutdownWhenDownloadsComplete(false);
-            pref->setSuspendWhenDownloadsComplete(false);
-            pref->setHibernateWhenDownloadsComplete(false);
-            // Make sure preferences are synced before exiting
-            m_shutdownAct = action;
-        }
-        qDebug("Exiting the application");
-        exit();
+#ifndef DISABLE_GUI
+    // ask confirm
+    if ((action == ShutdownDialogAction::Exit) && (pref->dontConfirmAutoExit())) {
+        // do nothing & skip confirm
+    }
+    else {
+        if (!ShutdownConfirmDlg::askForConfirmation(action)) return;
     }
 #endif // DISABLE_GUI
+
+    // Actually shut down
+    if (action != ShutdownDialogAction::Exit) {
+        qDebug("Preparing for auto-shutdown because all downloads are complete!");
+        // Disabling it for next time
+        pref->setShutdownWhenDownloadsComplete(false);
+        pref->setSuspendWhenDownloadsComplete(false);
+        pref->setHibernateWhenDownloadsComplete(false);
+        // Make sure preferences are synced before exiting
+        m_shutdownAct = action;
+    }
+
+    qDebug("Exiting the application");
+    exit();
 }
 
 bool Application::sendParams(const QStringList &params)
@@ -247,7 +386,7 @@ void Application::processParams(const QStringList &params)
     foreach (QString param, params) {
         param = param.trimmed();
 #ifndef DISABLE_GUI
-        if (Preferences::instance()->useAdditionDialog())
+        if (AddNewTorrentDialog::isEnabled())
             AddNewTorrentDialog::show(param, m_window);
         else
 #endif
@@ -257,6 +396,7 @@ void Application::processParams(const QStringList &params)
 
 int Application::exec(const QStringList &params)
 {
+    Net::ProxyConfigurationManager::initInstance();
     Net::DownloadManager::initInstance();
 #ifdef DISABLE_GUI
     IconProvider::initInstance();
@@ -266,7 +406,7 @@ int Application::exec(const QStringList &params)
 
     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()));
+    connect(BitTorrent::Session::instance(), SIGNAL(allTorrentsFinished()), SLOT(allTorrentsFinished()), Qt::QueuedConnection);
 
 #ifndef DISABLE_COUNTRIES_RESOLUTION
     Net::GeoIPManager::initInstance();
@@ -443,11 +583,9 @@ void Application::cleanup()
 #ifndef DISABLE_GUI
 #ifdef Q_OS_WIN
     // cleanup() can be called multiple times during shutdown. We only need it once.
-    static bool alreadyDone = false;
-
-    if (alreadyDone)
+    static QAtomicInt alreadyDone;
+    if (!alreadyDone.testAndSetAcquire(0, 1))
         return;
-    alreadyDone = true;
 #endif // Q_OS_WIN
 
     // Hide the window and not leave it on screen as
@@ -485,10 +623,13 @@ void Application::cleanup()
     Net::GeoIPManager::freeInstance();
 #endif
     Net::DownloadManager::freeInstance();
+    Net::ProxyConfigurationManager::freeInstance();
     Preferences::freeInstance();
+    SettingsStorage::freeInstance();
     delete m_fileLogger;
     Logger::freeInstance();
     IconProvider::freeInstance();
+
 #ifndef DISABLE_GUI
 #ifdef Q_OS_WIN
     typedef BOOL (WINAPI *PSHUTDOWNBRDESTROY)(HWND);
@@ -498,9 +639,10 @@ void Application::cleanup()
         shutdownBRDestroy((HWND)m_window->effectiveWinId());
 #endif // Q_OS_WIN
     delete m_window;
-    if (m_shutdownAct != ShutdownAction::None) {
+#endif // DISABLE_GUI
+
+    if (m_shutdownAct != ShutdownDialogAction::Exit) {
         qDebug() << "Sending computer shutdown/suspend/hibernate signal...";
         Utils::Misc::shutdownComputer(m_shutdownAct);
     }
-#endif
 }

src/app/application.h

@@ -76,6 +76,26 @@ public:
     int exec(const QStringList &params);
     bool sendParams(const QStringList &params);
 
+#ifndef DISABLE_GUI
+    QPointer<MainWindow> mainWindow();
+#endif
+
+    // FileLogger properties
+    bool isFileLoggerEnabled() const;
+    void setFileLoggerEnabled(bool value);
+    QString fileLoggerPath() const;
+    void setFileLoggerPath(const QString &path);
+    bool isFileLoggerBackup() const;
+    void setFileLoggerBackup(bool value);
+    bool isFileLoggerDeleteOld() const;
+    void setFileLoggerDeleteOld(bool value);
+    int fileLoggerMaxSize() const;
+    void setFileLoggerMaxSize(const int value);
+    int fileLoggerAge() const;
+    void setFileLoggerAge(const int value);
+    int fileLoggerAgeType() const;
+    void setFileLoggerAgeType(const int value);
+
 protected:
 #ifndef DISABLE_GUI
 #ifdef Q_OS_MAC
@@ -85,7 +105,6 @@ protected:
 #endif
 
 private slots:
-    void configure();
     void processMessage(const QString &message);
     void torrentFinished(BitTorrent::TorrentHandle *const torrent);
     void allTorrentsFinished();
@@ -96,10 +115,10 @@ private slots:
 
 private:
     bool m_running;
+    ShutdownDialogAction m_shutdownAct;
 
 #ifndef DISABLE_GUI
     QPointer<MainWindow> m_window;
-    ShutdownAction m_shutdownAct;
 #endif
 
 #ifndef DISABLE_WEBUI
@@ -115,6 +134,7 @@ private:
 
     void initializeTranslation();
     void processParams(const QStringList &params);
+    void runExternalProgram(BitTorrent::TorrentHandle *const torrent) const;
     void sendNotificationEmail(BitTorrent::TorrentHandle *const torrent);
 };
 

src/app/filelogger.cpp

@@ -26,37 +26,31 @@
  * exception statement from your version.
  */
 
+#include <QDateTime>
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
 #include "filelogger.h"
-#include "base/preferences.h"
 #include "base/logger.h"
 #include "base/utils/fs.h"
 
-namespace
-{
-    enum FileLogAgeType
-    {
-        DAYS,
-        MONTHS,
-        YEARS
-    };
-}
-
-FileLogger::FileLogger()
-    : m_logFile(nullptr)
+FileLogger::FileLogger(const QString &path, const bool backup, const int maxSize, const bool deleteOld, const int age, const FileLogAgeType ageType)
+    : m_backup(backup)
+    , m_maxSize(maxSize)
+    , m_logFile(nullptr)
 {
     m_flusher.setInterval(0);
     m_flusher.setSingleShot(true);
     connect(&m_flusher, SIGNAL(timeout()), SLOT(flushLog()));
 
-    configure();
+    changePath(path);
+    if (deleteOld)
+        this->deleteOld(age, ageType);
+
     const Logger* const logger = Logger::instance();
     foreach (const Log::Msg& msg, logger->getMessages())
         addLogMessage(msg);
 
-    connect(Preferences::instance(), SIGNAL(changed()), SLOT(configure()));
     connect(logger, SIGNAL(newLogMessage(const Log::Msg &)), SLOT(addLogMessage(const Log::Msg &)));
 }
 
@@ -67,10 +61,9 @@ FileLogger::~FileLogger()
     delete m_logFile;
 }
 
-void FileLogger::configure()
+void FileLogger::changePath(const QString& newPath)
 {
-    const Preferences* const pref = Preferences::instance();
-    QString tmpPath = Utils::Fs::fromNativePath(pref->fileLogPath());
+    QString tmpPath = Utils::Fs::fromNativePath(newPath);
     QDir dir(tmpPath);
     dir.mkpath(tmpPath);
     tmpPath = dir.absoluteFilePath("qbittorrent.log");
@@ -85,30 +78,39 @@ void FileLogger::configure()
         m_logFile = new QFile(m_path);
         openLogFile();
     }
+}
 
-    m_backup = pref->fileLogBackup();
-    m_size = pref->fileLogMaxSize();
+void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
+{
+    QDateTime date = QDateTime::currentDateTime();
+    QDir dir(m_path);
 
-    if (pref->fileLogDeleteOld()) {
-        QDateTime date = QDateTime::currentDateTime();
-
-        switch (static_cast<FileLogAgeType>(pref->fileLogAgeType())) {
-        case DAYS:
-            date = date.addDays(pref->fileLogAge());
-            break;
-        case MONTHS:
-            date = date.addMonths(pref->fileLogAge());
-            break;
-        default:
-            date = date.addYears(pref->fileLogAge());
-        }
-
-        foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) {
-            if (file.lastModified() < date)
-                break;
-            Utils::Fs::forceRemove(file.absoluteFilePath());
-        }
+    switch (ageType) {
+    case DAYS:
+        date = date.addDays(age);
+        break;
+    case MONTHS:
+        date = date.addMonths(age);
+        break;
+    default:
+        date = date.addYears(age);
     }
+
+    foreach (const QFileInfo file, dir.entryInfoList(QStringList("qbittorrent.log.bak*"), QDir::Files | QDir::Writable, QDir::Time | QDir::Reversed)) {
+        if (file.lastModified() < date)
+            break;
+        Utils::Fs::forceRemove(file.absoluteFilePath());
+    }
+}
+
+void FileLogger::setBackup(bool value)
+{
+    m_backup = value;
+}
+
+void FileLogger::setMaxSize(int value)
+{
+    m_maxSize = value;
 }
 
 void FileLogger::addLogMessage(const Log::Msg &msg)
@@ -133,7 +135,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_size * 1024 * 1024))) {
+    if (m_backup && (m_logFile->size() >= (m_maxSize * 1024 * 1024))) {
         closeLogFile();
         int counter = 0;
         QString backupLogFilename = m_path + ".bak";

src/app/filelogger.h

@@ -45,11 +45,22 @@ class FileLogger : public QObject
     Q_DISABLE_COPY(FileLogger)
 
 public:
-    FileLogger();
+    enum FileLogAgeType
+    {
+        DAYS,
+        MONTHS,
+        YEARS
+    };
+
+    FileLogger(const QString &path, const bool backup, const int maxSize, const bool deleteOld, const int age, const FileLogAgeType ageType);
     ~FileLogger();
 
+    void changePath(const QString &newPath);
+    void deleteOld(const int age, const FileLogAgeType ageType);
+    void setBackup(bool value);
+    void setMaxSize(int value);
+
 private slots:
-    void configure();
     void addLogMessage(const Log::Msg &msg);
     void flushLog();
 
@@ -57,9 +68,9 @@ private:
     void openLogFile();
     void closeLogFile();
 
-    bool m_backup;
-    int m_size;
     QString m_path;
+    bool m_backup;
+    int m_maxSize;
     QFile *m_logFile;
     QTimer m_flusher;
 };

src/app/main.cpp

@@ -135,6 +135,12 @@ int main(int argc, char *argv[])
     // We must save it here because QApplication constructor may change it
     bool isOneArg = (argc == 2);
 
+#ifdef Q_OS_MAC
+    // On macOS 10.12 Sierra, Apple changed the behaviour of CFPreferencesSetValue() https://bugreports.qt.io/browse/QTBUG-56344
+    // Due to this, we have to move from native plist to IniFormat
+    macMigratePlists();
+#endif
+
     // Create Application
     QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString();
     QScopedPointer<Application> app(new Application(appId, argc, argv));
@@ -230,6 +236,17 @@ int main(int argc, char *argv[])
     qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
 #endif
 
+#if defined(Q_OS_MAC)
+{
+    // Since Apple made difficult for users to set PATH, we set here for convenience.
+    // Users are supposed to install Homebrew Python for search function.
+    // For more info see issue #5571.
+    QByteArray path = "/usr/local/bin:";
+    path += qgetenv("PATH");
+    qputenv("PATH", path.constData());
+}
+#endif
+
 #ifndef DISABLE_GUI
     if (!upgrade()) return EXIT_FAILURE;
 #else

src/app/qtsingleapplication/CMakeLists.txt

@@ -1,3 +1,5 @@
+project(qtsingleapplication)
+
 set(QBT_QTSINGLEAPPLICATION_HEADERS
 qtlocalpeer.h
 )
@@ -15,6 +17,7 @@ else (GUI)
 endif (GUI)
 
 add_library(qtsingleapplication ${QBT_QTSINGLEAPPLICATION_HEADERS} ${QBT_QTSINGLEAPPLICATION_SOURCES})
+target_include_directories(qtsingleapplication INTERFACE "${qtsingleapplication_SOURCE_DIR}")
 
 if (QT4_FOUND)
     target_link_libraries(qtsingleapplication Qt4::QtNetwork)
@@ -30,3 +33,4 @@ if (GUI)
     endif(QT4_FOUND)
 endif (GUI)
 
+add_library(QtSingleApplication::QtSingleApplication ALIAS qtsingleapplication)

src/app/stacktrace_win.h

@@ -25,6 +25,7 @@
 #include <dbghelp.h>
 #include <stdio.h>
 
+#include <QDir>
 #include <QTextStream>
 #ifdef __MINGW32__
 #include <cxxabi.h>
@@ -41,6 +42,9 @@ namespace straceWin
 #ifdef __MINGW32__
     void demangle(QString& str);
 #endif
+
+    QString getSourcePathAndLineNumber(HANDLE hProcess, DWORD64 addr);
+    bool makeRelativePath(const QString& dir, QString& file);
 }
 
 #ifdef __MINGW32__
@@ -108,6 +112,65 @@ BOOL CALLBACK straceWin::EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVO
 }
 
 
+/**
+* Cuts off leading 'dir' path from 'file' path, otherwise leaves it unchanged
+* returns true if 'dir' is an ancestor of 'file', otherwise - false
+*/
+bool straceWin::makeRelativePath(const QString& dir, QString& file)
+{
+    QString d = QDir::toNativeSeparators(QDir(dir).absolutePath());
+    QString f = QDir::toNativeSeparators(QFileInfo(file).absoluteFilePath());
+
+    // append separator at the end of dir
+    QChar separator = QDir::separator();
+    if (!d.isEmpty() && (d[d.length() - 1] != separator))
+        d += separator;
+
+    if (f.startsWith(d, Qt::CaseInsensitive)) {
+        f.remove(0, d.length());
+        file.swap(f);
+
+        return true;
+    }
+
+    return false;
+}
+
+QString straceWin::getSourcePathAndLineNumber(HANDLE hProcess, DWORD64 addr)
+{
+    IMAGEHLP_LINE64 line = {0};
+    line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
+    DWORD dwDisplacement = 0;
+
+    if (SymGetLineFromAddr64(hProcess, addr, &dwDisplacement, &line)) {
+        QString path(line.FileName);
+
+#if defined STACKTRACE_WIN_PROJECT_PATH || defined STACKTRACE_WIN_MAKEFILE_PATH
+
+#define STACKTRACE_WIN_QUOTE(x)  #x
+#define STACKTRACE_WIN_STRING(x)  STACKTRACE_WIN_QUOTE(x)
+
+        //prune leading project directory path or build target directory path
+
+        bool success = false;
+#ifdef STACKTRACE_WIN_PROJECT_PATH
+        QString projectPath(STACKTRACE_WIN_STRING(STACKTRACE_WIN_PROJECT_PATH));
+        success = makeRelativePath(projectPath, path);
+#endif
+
+#ifdef STACKTRACE_WIN_MAKEFILE_PATH
+        if (!success) {
+            QString targetPath(STACKTRACE_WIN_STRING(STACKTRACE_WIN_MAKEFILE_PATH));
+            makeRelativePath(targetPath, path);
+        }
+#endif
+#endif
+        return QString("%1 : %2").arg(path).arg(line.LineNumber);
+    }
+
+    return QString();
+}
+
 
 #if defined( _M_IX86 ) && defined(Q_CC_MSVC)
 // Disable global optimization and ignore /GS waning caused by
@@ -221,11 +284,16 @@ const QString straceWin::getBacktrace()
                     fileName = fileName.mid(slashPos + 1);
             }
             QString funcName;
+            QString sourceFile;
             if(SymFromAddr(hProcess, ihsf.InstructionOffset, &dwDisplacement, pSymbol)) {
                 funcName = QString(pSymbol->Name);
 #ifdef __MINGW32__
                 demangle(funcName);
 #endif
+
+                // now ihsf.InstructionOffset points to the instruction that follows CALL instuction
+                // decrease the query address by one byte to point somewhere in the CALL instruction byte sequence
+                sourceFile = getSourcePathAndLineNumber(hProcess, ihsf.InstructionOffset - 1);
             }
             else {
                 funcName = QString("0x%1").arg(ihsf.InstructionOffset, 8, 16, QLatin1Char('0'));
@@ -248,6 +316,9 @@ const QString straceWin::getBacktrace()
                                 .arg(funcName)
 #ifndef __MINGW32__
                                 .arg(params.join(", "));
+
+            if (!sourceFile.isEmpty())
+                debugLine += QString("[ %1 ]").arg(sourceFile);
 #else
                                 ;
 #endif
@@ -262,6 +333,8 @@ const QString straceWin::getBacktrace()
     //logStream << "\n\nList of linked Modules:\n";
     //EnumModulesContext modulesContext(hProcess, logStream);
     //SymEnumerateModules64(hProcess, EnumModulesCB, (PVOID)&modulesContext);
+    SymCleanup(hProcess);
+
     logStream << "```";
     return log;
 }

src/app/upgrade.h

@@ -29,24 +29,31 @@
 #ifndef UPGRADE_H
 #define UPGRADE_H
 
-#include <libtorrent/lazy_entry.hpp>
-#include <libtorrent/entry.hpp>
+#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/lazy_entry.hpp>
+#endif
+
 
-#include <QString>
 #include <QDir>
 #include <QFile>
-#include <QRegExp>
 #ifndef DISABLE_GUI
 #include <QMessageBox>
 #endif
+#include <QRegExp>
+#include <QString>
 
 #include "base/logger.h"
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
-#include "base/qinisettings.h"
 #include "base/preferences.h"
+#include "base/qinisettings.h"
 
 bool userAcceptsUpgrade()
 {
@@ -86,10 +93,16 @@ bool upgradeResumeFile(const QString &filepath, const QVariantHash &oldTorrent =
     QByteArray data = file1.readAll();
     file1.close();
 
-    libtorrent::lazy_entry fastOld;
     libtorrent::error_code ec;
-    libtorrent::lazy_bdecode(data.constData(), data.constData() + data.size(), fastOld, ec);
-    if (ec || (fastOld.type() != libtorrent::lazy_entry::dict_t)) return false;
+#if LIBTORRENT_VERSION_NUM < 10100
+        libtorrent::lazy_entry fastOld;
+        libtorrent::lazy_bdecode(data.constData(), data.constData() + data.size(), fastOld, ec);
+        if (ec || (fastOld.type() != libtorrent::lazy_entry::dict_t)) return false;
+#else
+        libtorrent::bdecode_node fastOld;
+        libtorrent::bdecode(data.constData(), data.constData() + data.size(), fastOld, ec);
+        if (ec || (fastOld.type() != libtorrent::bdecode_node::dict_t)) return false;
+#endif
 
     libtorrent::entry fastNew;
     fastNew = fastOld;
@@ -129,8 +142,8 @@ bool upgradeResumeFile(const QString &filepath, const QVariantHash &oldTorrent =
 
 bool upgrade(bool ask = true)
 {
-    // Move RSS cookies to common storage
-    Preferences::instance()->moveRSSCookies();
+    // Upgrade preferences
+    Preferences::instance()->upgrade();
 
     QString backupFolderPath = Utils::Fs::expandPathAbs(Utils::Fs::QDesktopServicesDataLocation() + "BT_backup");
     QDir backupFolderDir(backupFolderPath);
@@ -143,7 +156,12 @@ bool upgrade(bool ask = true)
         upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile));
     // ****************************************************************************************
 
+#ifdef Q_OS_MAC
+    // native .plist
+    QSettings *oldResumeSettings = new QSettings("qBittorrent", "qBittorrent-resume");
+#else
     QIniSettings *oldResumeSettings = new QIniSettings("qBittorrent", "qBittorrent-resume");
+#endif
     QString oldResumeFilename = oldResumeSettings->fileName();
     QVariantHash oldResumeData = oldResumeSettings->value("torrents").toHash();
     delete oldResumeSettings;
@@ -210,4 +228,34 @@ bool upgrade(bool ask = true)
     return true;
 }
 
+
+#ifdef Q_OS_MAC
+void migratePlistToIni(const QString &application)
+{
+    QIniSettings iniFile("qBittorrent", application);
+    if (!iniFile.allKeys().isEmpty()) return; // We copy the contents of plist, only if inifile does not exist(is empty).
+
+    QSettings *plistFile = new QSettings("qBittorrent", application);
+    plistFile->setFallbacksEnabled(false);
+    const QStringList plist = plistFile->allKeys();
+    if (!plist.isEmpty()) {
+        foreach (const QString &key, plist)
+            iniFile.setValue(key, plistFile->value(key));
+        plistFile->clear();
+    }
+
+    QString plistPath = plistFile->fileName();
+    delete plistFile;
+    Utils::Fs::forceRemove(plistPath);
+}
+
+void macMigratePlists()
+{
+    migratePlistToIni("qBittorrent-data");
+    migratePlistToIni("qBittorrent-rss");
+    migratePlistToIni("qBittorrent");
+}
+#endif  // Q_OS_MAC
+
+
 #endif // UPGRADE_H

src/base/CMakeLists.txt

@@ -1,5 +1,4 @@
 find_package(ZLIB REQUIRED)
-include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
 
 set(QBT_BASE_HEADERS
 bittorrent/cachestatus.h
@@ -31,6 +30,7 @@ net/downloadmanager.h
 net/geoipmanager.h
 net/portforwarder.h
 net/private/geoipdatabase.h
+net/proxyconfigurationmanager.h
 net/reverseresolution.h
 net/smtp.h
 rss/private/rssparser.h
@@ -47,12 +47,14 @@ utils/misc.h
 utils/string.h
 filesystemwatcher.h
 iconprovider.h
+indexrange.h
 logger.h
 preferences.h
 qinisettings.h
 scanfoldersmodel.h
 searchengine.h
 settingsstorage.h
+torrentfileguard.h
 torrentfilter.h
 tristatebool.h
 types.h
@@ -87,6 +89,7 @@ net/downloadmanager.cpp
 net/geoipmanager.cpp
 net/portforwarder.cpp
 net/private/geoipdatabase.cpp
+net/proxyconfigurationmanager.cpp
 net/reverseresolution.cpp
 net/smtp.cpp
 rss/private/rssparser.cpp
@@ -108,12 +111,13 @@ preferences.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 ${ZLIB_LIBRARIES} ${LibtorrentRasterbar_LIBRARIES})
+target_link_libraries(qbt_base ZLIB::ZLIB LibtorrentRasterbar::LibTorrent)
 target_link_qt_components(qbt_base Core Network Xml)
 if (QT4_FOUND)
     if (GUI)
@@ -124,6 +128,11 @@ else (QT4_FOUND)
         target_link_libraries(qbt_base Qt5::Gui Qt5::Widgets)
     endif (GUI)
 endif (QT4_FOUND)
+
+if (DBUS)
+    target_link_qt_components(qbt_base DBus)
+endif ()
+
 if (APPLE)
     find_library(IOKit_LIBRARY IOKit)
     find_library(Carbon_LIBRARY Carbon)

src/base/base.pri

@@ -4,7 +4,10 @@ HEADERS += \
     $$PWD/filesystemwatcher.h \
     $$PWD/qinisettings.h \
     $$PWD/logger.h \
+    $$PWD/settingsstorage.h \
+    $$PWD/settingvalue.h \
     $$PWD/preferences.h \
+    $$PWD/indexrange.h \
     $$PWD/iconprovider.h \
     $$PWD/http/irequesthandler.h \
     $$PWD/http/connection.h \
@@ -18,6 +21,7 @@ HEADERS += \
     $$PWD/net/downloadhandler.h \
     $$PWD/net/geoipmanager.h \
     $$PWD/net/portforwarder.h \
+    $$PWD/net/proxyconfigurationmanager.h \
     $$PWD/net/reverseresolution.h \
     $$PWD/net/smtp.h \
     $$PWD/net/private/geoipdatabase.h \
@@ -50,6 +54,7 @@ HEADERS += \
     $$PWD/utils/misc.h \
     $$PWD/utils/string.h \
     $$PWD/unicodestrings.h \
+    $$PWD/torrentfileguard.h \
     $$PWD/torrentfilter.h \
     $$PWD/scanfoldersmodel.h \
     $$PWD/searchengine.h
@@ -58,6 +63,7 @@ SOURCES += \
     $$PWD/tristatebool.cpp \
     $$PWD/filesystemwatcher.cpp \
     $$PWD/logger.cpp \
+    $$PWD/settingsstorage.cpp \
     $$PWD/preferences.cpp \
     $$PWD/iconprovider.cpp \
     $$PWD/http/connection.cpp \
@@ -70,6 +76,7 @@ SOURCES += \
     $$PWD/net/downloadhandler.cpp \
     $$PWD/net/geoipmanager.cpp \
     $$PWD/net/portforwarder.cpp \
+    $$PWD/net/proxyconfigurationmanager.cpp \
     $$PWD/net/reverseresolution.cpp \
     $$PWD/net/smtp.cpp \
     $$PWD/net/private/geoipdatabase.cpp \
@@ -101,6 +108,7 @@ SOURCES += \
     $$PWD/utils/gzip.cpp \
     $$PWD/utils/misc.cpp \
     $$PWD/utils/string.cpp \
+    $$PWD/torrentfileguard.cpp \
     $$PWD/torrentfilter.cpp \
     $$PWD/scanfoldersmodel.cpp \
     $$PWD/searchengine.cpp

src/base/bittorrent/infohash.cpp

@@ -68,7 +68,6 @@ bool InfoHash::isValid() const
     return m_valid;
 }
 
-
 InfoHash::operator libtorrent::sha1_hash() const
 {
     return m_nativeHash;

src/base/bittorrent/private/bandwidthscheduler.cpp

@@ -31,13 +31,13 @@
 #include <QTime>
 #include <QDateTime>
 
+#include "base/bittorrent/session.h"
 #include "base/preferences.h"
 #include "bandwidthscheduler.h"
 
 BandwidthScheduler::BandwidthScheduler(QObject *parent)
     : QTimer(parent)
 {
-    Q_ASSERT(Preferences::instance()->isSchedulerEnabled());
     // Single shot, we call start() again manually
     setSingleShot(true);
     // Connect Signals/Slots
@@ -47,8 +47,7 @@ BandwidthScheduler::BandwidthScheduler(QObject *parent)
 void BandwidthScheduler::start()
 {
     const Preferences* const pref = Preferences::instance();
-    Q_ASSERT(pref->isSchedulerEnabled());
-    bool alt_bw_enabled = pref->isAltBandwidthEnabled();
+    bool alt_bw_enabled = BitTorrent::Session::instance()->isAltGlobalSpeedLimitEnabled();
 
     QTime start = pref->getSchedulerStartTime();
     QTime end = pref->getSchedulerEndTime();

src/base/bittorrent/private/filterparserthread.cpp

@@ -55,10 +55,10 @@ FilterParserThread::~FilterParserThread()
 }
 
 // Parser for eMule ip filter in DAT format
-int FilterParserThread::parseDATFilterFile(QString m_filePath, libt::ip_filter &filter)
+int FilterParserThread::parseDATFilterFile(QString filePath, libt::ip_filter &filter)
 {
     int ruleCount = 0;
-    QFile file(m_filePath);
+    QFile file(filePath);
     if (!file.exists()) return ruleCount;
 
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -149,10 +149,10 @@ int FilterParserThread::parseDATFilterFile(QString m_filePath, libt::ip_filter &
 }
 
 // Parser for PeerGuardian ip filter in p2p format
-int FilterParserThread::parseP2PFilterFile(QString m_filePath, libt::ip_filter &filter)
+int FilterParserThread::parseP2PFilterFile(QString filePath, libt::ip_filter &filter)
 {
     int ruleCount = 0;
-    QFile file(m_filePath);
+    QFile file(filePath);
     if (!file.exists()) return ruleCount;
 
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -257,10 +257,10 @@ int FilterParserThread::getlineInStream(QDataStream &stream, std::string &name,
 }
 
 // Parser for PeerGuardian ip filter in p2p format
-int FilterParserThread::parseP2BFilterFile(QString m_filePath, libt::ip_filter &filter)
+int FilterParserThread::parseP2BFilterFile(QString filePath, libt::ip_filter &filter)
 {
     int ruleCount = 0;
-    QFile file(m_filePath);
+    QFile file(filePath);
     if (!file.exists()) return ruleCount;
 
     if (!file.open(QIODevice::ReadOnly)) {
@@ -369,7 +369,7 @@ int FilterParserThread::parseP2BFilterFile(QString m_filePath, libt::ip_filter &
 //  * eMule IP list (DAT): http://wiki.phoenixlabs.org/wiki/DAT_Format
 //  * PeerGuardian Text (P2P): http://wiki.phoenixlabs.org/wiki/P2P_Format
 //  * PeerGuardian Binary (P2B): http://wiki.phoenixlabs.org/wiki/P2B_Format
-void FilterParserThread::processFilterFile(QString _filePath)
+void FilterParserThread::processFilterFile(QString filePath)
 {
     if (isRunning()) {
         // Already parsing a filter, m_abort first
@@ -378,30 +378,37 @@ void FilterParserThread::processFilterFile(QString _filePath)
     }
 
     m_abort = false;
-    m_filePath = _filePath;
+    m_filePath = filePath;
     // Run it
     start();
 }
 
-void FilterParserThread::processFilterList(libt::session *s, const QStringList &IPs)
-{
-    // First, import current filter
-    libt::ip_filter filter = s->get_ip_filter();
-    foreach (const QString &ip, IPs) {
-        qDebug("Manual ban of peer %s", ip.toLocal8Bit().constData());
-        boost::system::error_code ec;
-        libt::address addr = libt::address::from_string(ip.toLocal8Bit().constData(), ec);
-        Q_ASSERT(!ec);
-        if (!ec)
-            filter.add_rule(addr, addr, libt::ip_filter::blocked);
-    }
-
-    s->set_ip_filter(filter);
-}
-
 QString FilterParserThread::cleanupIPAddress(QString _ip)
 {
-    QHostAddress ip(_ip.trimmed());
+    _ip = _ip.trimmed();
+
+    // Emule .DAT files contain leading zeroes in IPv4 addresses
+    // eg 001.009.106.186
+    // We need to remove them because both QHostAddress and Boost.Asio fail to parse them.
+    QStringList octets = _ip.split('.', QString::SkipEmptyParts);
+    if (octets.size() == 4) {
+        QString octet; // it is faster to not recreate this object in the loop
+        for (int i = 0; i < 4; i++) {
+            octet = octets[i];
+            if ((octet[0] == QChar('0')) && (octet.count() > 1)) {
+                if ((octet[1] == QChar('0')) && (octet.count() > 2))
+                    octet.remove(0, 2);
+                else
+                    octet.remove(0, 1);
+
+                octets[i] = octet;
+            }
+        }
+
+        _ip = octets.join(".");
+    }
+
+    QHostAddress ip(_ip);
     if (ip.isNull()) return QString();
 
     return ip.toString();

src/base/bittorrent/private/filterparserthread.h

@@ -54,8 +54,7 @@ public:
     int parseP2PFilterFile(QString filePath, libtorrent::ip_filter &filter);
     int getlineInStream(QDataStream &stream, std::string &name, char delim);
     int parseP2BFilterFile(QString filePath, libtorrent::ip_filter &filter);
-    void processFilterFile(QString _filePath);
-    static void processFilterList(libtorrent::session *s, const QStringList &IPs);
+    void processFilterFile(QString filePath);
 
 signals:
     void IPFilterParsed(int ruleCount);

src/base/bittorrent/private/speedmonitor.cpp

@@ -27,17 +27,21 @@
  * exception statement from your version.
  */
 
-#include <QList>
 #include "speedmonitor.h"
 
+SpeedMonitor::SpeedMonitor()
+    : m_speedSamples(MAX_SAMPLES)
+{
+}
+
 void SpeedMonitor::addSample(const SpeedSample &sample)
 {
+    if (m_speedSamples.size() >= MAX_SAMPLES) {
+        m_sum -= m_speedSamples.front();
+    }
+
     m_speedSamples.push_back(sample);
     m_sum += sample;
-    if (m_speedSamples.size() > MAX_SAMPLES) {
-        m_sum -= m_speedSamples.front();
-        m_speedSamples.pop_front();
-    }
 }
 
 SpeedSampleAvg SpeedMonitor::average() const

src/base/bittorrent/private/speedmonitor.h

@@ -30,7 +30,11 @@
 #ifndef SPEEDMONITOR_H
 #define SPEEDMONITOR_H
 
-template<typename T> class QList;
+#ifndef Q_MOC_RUN
+#include <boost/circular_buffer.hpp>
+#endif
+
+#include <QtGlobal>
 
 template<typename T>
 struct Sample
@@ -71,13 +75,15 @@ typedef Sample<qreal> SpeedSampleAvg;
 class SpeedMonitor
 {
 public:
+    SpeedMonitor();
+
     void addSample(const SpeedSample &sample);
     SpeedSampleAvg average() const;
     void reset();
 
 private:
     static const int MAX_SAMPLES = 30;
-    QList<SpeedSample> m_speedSamples;
+    boost::circular_buffer<SpeedSample> m_speedSamples;
     SpeedSample m_sum;
 };
 

src/base/bittorrent/private/statistics.cpp

@@ -3,7 +3,6 @@
 #include <libtorrent/session.hpp>
 
 #include "base/qinisettings.h"
-#include "base/preferences.h"
 #include "base/bittorrent/sessionstatus.h"
 #include "base/bittorrent/session.h"
 #include "statistics.h"
@@ -76,40 +75,9 @@ void Statistics::save() const
 
 void Statistics::load()
 {
-    // Temp code. Versions v3.1.4 and v3.1.5 saved the data in the qbittorrent.ini file.
-    // This code reads the data from there, writes it to the new file, and removes the keys
-    // from the old file. This code should be removed after some time has passed.
-    // e.g. When we reach v3.3.0
-    // Don't forget to remove:
-    // 1. Preferences::getStats()
-    // 2. Preferences::removeStats()
-    // 3. #include "base/preferences.h"
-    Preferences* const pref = Preferences::instance();
     QIniSettings s("qBittorrent", "qBittorrent-data");
-    QVariantHash v = pref->getStats();
-
-    // Let's test if the qbittorrent.ini holds the key
-    if (!v.isEmpty()) {
-        m_dirty = true;
-
-        // If the user has used qbt > 3.1.5 and then reinstalled/used
-        // qbt < 3.1.6, there will be stats in qbittorrent-data.ini too
-        // so we need to merge those 2.
-        if (s.contains("Stats/AllStats")) {
-            QVariantHash tmp = s.value("Stats/AllStats").toHash();
-            v["AlltimeDL"] = v["AlltimeDL"].toULongLong() + tmp["AlltimeDL"].toULongLong();
-            v["AlltimeUL"] = v["AlltimeUL"].toULongLong() + tmp["AlltimeUL"].toULongLong();
-        }
-    }
-    else {
-        v = s.value("Stats/AllStats").toHash();
-    }
+    QVariantHash v = s.value("Stats/AllStats").toHash();
 
     m_alltimeDL = v["AlltimeDL"].toULongLong();
     m_alltimeUL = v["AlltimeUL"].toULongLong();
-
-    if (m_dirty) {
-        save();
-        pref->removeStats();
-    }
 }

src/base/bittorrent/session.h

@@ -30,16 +30,23 @@
 #ifndef BITTORRENT_SESSION_H
 #define BITTORRENT_SESSION_H
 
-#include <QFile>
-#include <QHash>
-#include <QPointer>
-#include <QVector>
-#include <QMutex>
-#include <QWaitCondition>
-#include <QNetworkConfigurationManager>
-
+#include <vector>
 #include <libtorrent/version.hpp>
 
+#include <QFile>
+#include <QHash>
+#include <QMap>
+#if LIBTORRENT_VERSION_NUM < 10100
+#include <QMutex>
+#endif
+#include <QNetworkConfigurationManager>
+#include <QPointer>
+#include <QReadWriteLock>
+#include <QStringList>
+#include <QVector>
+#include <QWaitCondition>
+
+#include "base/settingvalue.h"
 #include "base/tristatebool.h"
 #include "base/types.h"
 #include "torrentinfo.h"
@@ -51,19 +58,12 @@ namespace libtorrent
     class entry;
     struct add_torrent_params;
     struct pe_settings;
-    struct session_settings;
-    struct session_status;
-
 #if LIBTORRENT_VERSION_NUM < 10100
-    struct proxy_settings;
+    struct session_settings;
 #else
-    namespace aux
-    {
-        struct proxy_settings;
-    }
-
-    typedef aux::proxy_settings proxy_settings;
+    struct settings_pack;
 #endif
+    struct session_status;
 
     class alert;
     struct torrent_alert;
@@ -111,7 +111,17 @@ class BandwidthScheduler;
 class Statistics;
 class ResumeDataSavingManager;
 
-typedef QPair<QString, QString> QStringPair;
+enum MaxRatioAction
+{
+    Pause,
+    Remove
+};
+
+enum TorrentExportFolder
+{
+    Regular,
+    Finished
+};
 
 namespace BitTorrent
 {
@@ -127,7 +137,7 @@ namespace BitTorrent
     struct AddTorrentParams
     {
         QString name;
-        QString label;
+        QString category;
         QString savePath;
         bool disableTempPath = false; // e.g. for imported torrents
         bool sequential = false;
@@ -160,16 +170,164 @@ namespace BitTorrent
         static void freeInstance();
         static Session *instance();
 
-        bool isDHTEnabled() const;
-        bool isLSDEnabled() const;
-        bool isPexEnabled() const;
-        bool isQueueingEnabled() const;
-        qreal globalMaxRatio() const;
-        bool isTempPathEnabled() const;
-        bool isAppendExtensionEnabled() const;
-        bool useAppendLabelToSavePath() const;
         QString defaultSavePath() const;
+        void setDefaultSavePath(QString path);
         QString tempPath() const;
+        void setTempPath(QString path);
+        bool isTempPathEnabled() const;
+        void setTempPathEnabled(bool enabled);
+        QString torrentTempPath(const InfoHash &hash) const;
+
+        static bool isValidCategoryName(const QString &name);
+        // returns category itself and all top level categories
+        static QStringList expandCategory(const QString &category);
+
+        QStringList categories() const;
+        QString categorySavePath(const QString &categoryName) const;
+        bool addCategory(const QString &name, const QString &savePath = "");
+        bool editCategory(const QString &name, const QString &savePath);
+        bool removeCategory(const QString &name);
+        bool isSubcategoriesEnabled() const;
+        void setSubcategoriesEnabled(bool value);
+
+        // Torrent Management Mode subsystem (TMM)
+        //
+        // Each torrent can be either in Manual mode or in Automatic mode
+        // In Manual Mode various torrent properties are set explicitly(eg save path)
+        // In Automatic Mode various torrent properties are set implicitly(eg save path)
+        //     based on the associated category.
+        // In Automatic Mode torrent save path can be changed in following cases:
+        //     1. Default save path changed
+        //     2. Torrent category save path changed
+        //     3. Torrent category changed
+        //     (unless otherwise is specified)
+        bool isAutoTMMDisabledByDefault() const;
+        void setAutoTMMDisabledByDefault(bool value);
+        bool isDisableAutoTMMWhenCategoryChanged() const;
+        void setDisableAutoTMMWhenCategoryChanged(bool value);
+        bool isDisableAutoTMMWhenDefaultSavePathChanged() const;
+        void setDisableAutoTMMWhenDefaultSavePathChanged(bool value);
+        bool isDisableAutoTMMWhenCategorySavePathChanged() const;
+        void setDisableAutoTMMWhenCategorySavePathChanged(bool value);
+
+        qreal globalMaxRatio() const;
+        void setGlobalMaxRatio(qreal ratio);
+        bool isDHTEnabled() const;
+        void setDHTEnabled(bool enabled);
+        bool isLSDEnabled() const;
+        void setLSDEnabled(bool enabled);
+        bool isPeXEnabled() const;
+        void setPeXEnabled(bool enabled);
+        bool isTrackerExchangeEnabled() const;
+        void setTrackerExchangeEnabled(bool enabled);
+        bool isAddTorrentPaused() const;
+        void setAddTorrentPaused(bool value);
+        bool isTrackerEnabled() const;
+        void setTrackerEnabled(bool enabled);
+        bool isAppendExtensionEnabled() const;
+        void setAppendExtensionEnabled(bool enabled);
+        uint refreshInterval() const;
+        void setRefreshInterval(uint value);
+        bool isPreallocationEnabled() const;
+        void setPreallocationEnabled(bool enabled);
+        QString torrentExportDirectory() const;
+        void setTorrentExportDirectory(QString path);
+        QString finishedTorrentExportDirectory() const;
+        void setFinishedTorrentExportDirectory(QString path);
+
+        int globalDownloadSpeedLimit() const;
+        void setGlobalDownloadSpeedLimit(int limit);
+        int globalUploadSpeedLimit() const;
+        void setGlobalUploadSpeedLimit(int limit);
+        int altGlobalDownloadSpeedLimit() const;
+        void setAltGlobalDownloadSpeedLimit(int limit);
+        int altGlobalUploadSpeedLimit() const;
+        void setAltGlobalUploadSpeedLimit(int limit);
+        int downloadSpeedLimit() const;
+        void setDownloadSpeedLimit(int limit);
+        int uploadSpeedLimit() const;
+        void setUploadSpeedLimit(int limit);
+        bool isAltGlobalSpeedLimitEnabled() const;
+        void setAltGlobalSpeedLimitEnabled(bool enabled);
+        bool isBandwidthSchedulerEnabled() const;
+        void setBandwidthSchedulerEnabled(bool enabled);
+
+        uint saveResumeDataInterval() const;
+        void setSaveResumeDataInterval(uint value);
+        int port() const;
+        void setPort(int port);
+        bool useRandomPort() const;
+        void setUseRandomPort(bool value);
+        QString networkInterface() const;
+        void setNetworkInterface(const QString &interface);
+        QString networkInterfaceName() const;
+        void setNetworkInterfaceName(const QString &name);
+        QString networkInterfaceAddress() const;
+        void setNetworkInterfaceAddress(const QString &address);
+        bool isIPv6Enabled() const;
+        void setIPv6Enabled(bool enabled);
+        int encryption() const;
+        void setEncryption(int state);
+        bool isForceProxyEnabled() const;
+        void setForceProxyEnabled(bool enabled);
+        bool isProxyPeerConnectionsEnabled() const;
+        void setProxyPeerConnectionsEnabled(bool enabled);
+        bool isAddTrackersEnabled() const;
+        void setAddTrackersEnabled(bool enabled);
+        QString additionalTrackers() const;
+        void setAdditionalTrackers(const QString &trackers);
+        bool isIPFilteringEnabled() const;
+        void setIPFilteringEnabled(bool enabled);
+        QString IPFilterFile() const;
+        void setIPFilterFile(QString path);
+        bool announceToAllTrackers() const;
+        void setAnnounceToAllTrackers(bool val);
+        uint diskCacheSize() const;
+        void setDiskCacheSize(uint size);
+        uint diskCacheTTL() const;
+        void setDiskCacheTTL(uint ttl);
+        bool useOSCache() const;
+        void setUseOSCache(bool use);
+        bool isAnonymousModeEnabled() const;
+        void setAnonymousModeEnabled(bool enabled);
+        bool isQueueingSystemEnabled() const;
+        void setQueueingSystemEnabled(bool enabled);
+        bool ignoreSlowTorrentsForQueueing() const;
+        void setIgnoreSlowTorrentsForQueueing(bool ignore);
+        uint outgoingPortsMin() const;
+        void setOutgoingPortsMin(uint min);
+        uint outgoingPortsMax() const;
+        void setOutgoingPortsMax(uint max);
+        bool ignoreLimitsOnLAN() const;
+        void setIgnoreLimitsOnLAN(bool ignore);
+        bool includeOverheadInLimits() const;
+        void setIncludeOverheadInLimits(bool include);
+        QString announceIP() const;
+        void setAnnounceIP(const QString &ip);
+        bool isSuperSeedingEnabled() const;
+        void setSuperSeedingEnabled(bool enabled);
+        int maxConnections() const;
+        void setMaxConnections(int max);
+        int maxHalfOpenConnections() const;
+        void setMaxHalfOpenConnections(int max);
+        int maxConnectionsPerTorrent() const;
+        void setMaxConnectionsPerTorrent(int max);
+        int maxUploads() const;
+        void setMaxUploads(int max);
+        int maxUploadsPerTorrent() const;
+        void setMaxUploadsPerTorrent(int max);
+        int maxActiveDownloads() const;
+        void setMaxActiveDownloads(int max);
+        int maxActiveUploads() const;
+        void setMaxActiveUploads(int max);
+        int maxActiveTorrents() const;
+        void setMaxActiveTorrents(int max);
+        bool isUTPEnabled() const;
+        void setUTPEnabled(bool enabled);
+        bool isUTPRateLimited() const;
+        void setUTPRateLimited(bool limited);
+        bool isTrackerFilteringEnabled() const;
+        void setTrackerFilteringEnabled(bool enabled);
 
         TorrentHandle *findTorrent(const InfoHash &hash) const;
         QHash<InfoHash, TorrentHandle *> torrents() const;
@@ -180,16 +338,11 @@ namespace BitTorrent
         CacheStatus cacheStatus() const;
         quint64 getAlltimeDL() const;
         quint64 getAlltimeUL() const;
-        int downloadRateLimit() const;
-        int uploadRateLimit() const;
         bool isListening() const;
 
-        void changeSpeedLimitMode(bool alternative);
-        void setDownloadRateLimit(int rate);
-        void setUploadRateLimit(int rate);
-        void setGlobalMaxRatio(qreal ratio);
-        void enableIPFilter(const QString &filterPath, bool force = false);
-        void disableIPFilter();
+        MaxRatioAction maxRatioAction() const;
+        void setMaxRatioAction(MaxRatioAction act);
+
         void banIP(const QString &ip);
 
         bool isKnownTorrent(const InfoHash &hash) const;
@@ -208,7 +361,8 @@ namespace BitTorrent
         // TorrentHandle interface
         void handleTorrentRatioLimitChanged(TorrentHandle *const torrent);
         void handleTorrentSavePathChanged(TorrentHandle *const torrent);
-        void handleTorrentLabelChanged(TorrentHandle *const torrent, const QString &oldLabel);
+        void handleTorrentCategoryChanged(TorrentHandle *const torrent, const QString &oldCategory);
+        void handleTorrentSavingModeChanged(TorrentHandle *const torrent);
         void handleTorrentMetadataReceived(TorrentHandle *const torrent);
         void handleTorrentPaused(TorrentHandle *const torrent);
         void handleTorrentResumed(TorrentHandle *const torrent);
@@ -230,13 +384,15 @@ namespace BitTorrent
         void torrentsUpdated();
         void addTorrentFailed(const QString &error);
         void torrentAdded(BitTorrent::TorrentHandle *const torrent);
+        void torrentNew(BitTorrent::TorrentHandle *const torrent);
         void torrentAboutToBeRemoved(BitTorrent::TorrentHandle *const torrent);
         void torrentPaused(BitTorrent::TorrentHandle *const torrent);
         void torrentResumed(BitTorrent::TorrentHandle *const torrent);
         void torrentFinished(BitTorrent::TorrentHandle *const torrent);
         void torrentFinishedChecking(BitTorrent::TorrentHandle *const torrent);
         void torrentSavePathChanged(BitTorrent::TorrentHandle *const torrent);
-        void torrentLabelChanged(BitTorrent::TorrentHandle *const torrent, const QString &oldLabel);
+        void torrentCategoryChanged(BitTorrent::TorrentHandle *const torrent, const QString &oldCategory);
+        void torrentSavingModeChanged(BitTorrent::TorrentHandle *const torrent);
         void allTorrentsFinished();
         void metadataLoaded(const BitTorrent::TorrentInfo &info);
         void torrentMetadataLoaded(BitTorrent::TorrentHandle *const torrent);
@@ -247,16 +403,19 @@ namespace BitTorrent
         void trackerAuthenticationRequired(BitTorrent::TorrentHandle *const torrent);
         void recursiveTorrentDownloadPossible(BitTorrent::TorrentHandle *const torrent);
         void speedLimitModeChanged(bool alternative);
-        void ipFilterParsed(bool error, int ruleCount);
+        void IPFilterParsed(bool error, int ruleCount);
         void trackersAdded(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers);
         void trackersRemoved(BitTorrent::TorrentHandle *const torrent, const QList<BitTorrent::TrackerEntry> &trackers);
         void trackersChanged(BitTorrent::TorrentHandle *const torrent);
         void trackerlessStateChanged(BitTorrent::TorrentHandle *const torrent, bool trackerless);
         void downloadFromUrlFailed(const QString &url, const QString &reason);
         void downloadFromUrlFinished(const QString &url);
+        void categoryAdded(const QString &categoryName);
+        void categoryRemoved(const QString &categoryName);
+        void subcategoriesSupportChanged();
 
     private slots:
-        void configure();
+        void configureDeferred();
         void readAlerts();
         void refresh();
         void processBigRatios();
@@ -281,28 +440,30 @@ namespace BitTorrent
         void initResumeFolder();
 
         // Session configuration
-        void setSessionSettings();
-        void setProxySettings(libtorrent::proxy_settings proxySettings);
-        void adjustLimits();
+        Q_INVOKABLE void configure();
+#if LIBTORRENT_VERSION_NUM < 10100
+        void configure(libtorrent::session_settings &sessionSettings);
         void adjustLimits(libtorrent::session_settings &sessionSettings);
+#else
+        void configure(libtorrent::settings_pack &settingsPack);
+        void adjustLimits(libtorrent::settings_pack &settingsPack);
+#endif
+        void adjustLimits();
+        void processBannedIPs();
         const QStringList getListeningIPs();
-        void setListeningPort();
-        void setDefaultSavePath(const QString &path);
-        void setDefaultTempPath(const QString &path = QString());
-        void preAllocateAllFiles(bool b);
-        void setMaxConnectionsPerTorrent(int max);
-        void setMaxUploadsPerTorrent(int max);
-        void enableLSD(bool enable);
-        void enableDHT(bool enable);
+        void configureListeningInterface();
         void changeSpeedLimitMode_impl(bool alternative);
-
-        void setAppendLabelToSavePath(bool append);
-        void setAppendExtension(bool append);
+        void enableTracker(bool enable);
+        void enableBandwidthScheduler();
+        void populateAdditionalTrackers();
+        void enableIPFilter();
+        void disableIPFilter();
 
         void startUpTorrents();
         bool addTorrent_impl(AddTorrentData addData, const MagnetUri &magnetUri,
-                             const TorrentInfo &torrentInfo = TorrentInfo(),
+                             TorrentInfo torrentInfo = TorrentInfo(),
                              const QByteArray &fastresumeData = QByteArray());
+        bool findIncompleteFiles(TorrentInfo &torrentInfo, QString &savePath) const;
 
         void updateRatioTimer();
         void exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolder folder = TorrentExportFolder::Regular);
@@ -330,33 +491,100 @@ namespace BitTorrent
 
         void saveResumeData();
 
-        void dispatchAlerts(std::auto_ptr<libtorrent::alert> alertPtr);
-        void getPendingAlerts(QVector<libtorrent::alert *> &out, ulong time = 0);
+#if LIBTORRENT_VERSION_NUM < 10100
+        void dispatchAlerts(libtorrent::alert *alertPtr);
+#endif
+        void getPendingAlerts(std::vector<libtorrent::alert *> &out, ulong time = 0);
 
         // BitTorrent
         libtorrent::session *m_nativeSession;
 
-        bool m_LSDEnabled;
-        bool m_DHTEnabled;
-        bool m_PeXEnabled;
-        bool m_queueingEnabled;
-        bool m_torrentExportEnabled;
-        bool m_finishedTorrentExportEnabled;
-        bool m_preAllocateAll;
-        qreal m_globalMaxRatio;
+        bool m_deferredConfigureScheduled;
+        bool m_IPFilteringChanged;
+#if LIBTORRENT_VERSION_NUM >= 10100
+        bool m_listenInterfaceChanged; // optimization
+#endif
+        CachedSettingValue<bool> m_isDHTEnabled;
+        CachedSettingValue<bool> m_isLSDEnabled;
+        CachedSettingValue<bool> m_isPeXEnabled;
+        CachedSettingValue<bool> m_isTrackerExchangeEnabled;
+        CachedSettingValue<bool> m_isIPFilteringEnabled;
+        CachedSettingValue<bool> m_isTrackerFilteringEnabled;
+        CachedSettingValue<QString> m_IPFilterFile;
+        CachedSettingValue<bool> m_announceToAllTrackers;
+        CachedSettingValue<uint> m_diskCacheSize;
+        CachedSettingValue<uint> m_diskCacheTTL;
+        CachedSettingValue<bool> m_useOSCache;
+        CachedSettingValue<bool> m_isAnonymousModeEnabled;
+        CachedSettingValue<bool> m_isQueueingEnabled;
+        CachedSettingValue<int> m_maxActiveDownloads;
+        CachedSettingValue<int> m_maxActiveUploads;
+        CachedSettingValue<int> m_maxActiveTorrents;
+        CachedSettingValue<bool> m_ignoreSlowTorrentsForQueueing;
+        CachedSettingValue<uint> m_outgoingPortsMin;
+        CachedSettingValue<uint> m_outgoingPortsMax;
+        CachedSettingValue<bool> m_ignoreLimitsOnLAN;
+        CachedSettingValue<bool> m_includeOverheadInLimits;
+        CachedSettingValue<QString> m_announceIP;
+        CachedSettingValue<bool> m_isSuperSeedingEnabled;
+        CachedSettingValue<int> m_maxConnections;
+        CachedSettingValue<int> m_maxHalfOpenConnections;
+        CachedSettingValue<int> m_maxUploads;
+        CachedSettingValue<int> m_maxConnectionsPerTorrent;
+        CachedSettingValue<int> m_maxUploadsPerTorrent;
+        CachedSettingValue<bool> m_isUTPEnabled;
+        CachedSettingValue<bool> m_isUTPRateLimited;
+        CachedSettingValue<bool> m_isAddTrackersEnabled;
+        CachedSettingValue<QString> m_additionalTrackers;
+        CachedSettingValue<qreal> m_globalMaxRatio;
+        CachedSettingValue<bool> m_isAddTorrentPaused;
+        CachedSettingValue<bool> m_isAppendExtensionEnabled;
+        CachedSettingValue<uint> m_refreshInterval;
+        CachedSettingValue<bool> m_isPreallocationEnabled;
+        CachedSettingValue<QString> m_torrentExportDirectory;
+        CachedSettingValue<QString> m_finishedTorrentExportDirectory;
+        CachedSettingValue<int> m_globalDownloadSpeedLimit;
+        CachedSettingValue<int> m_globalUploadSpeedLimit;
+        CachedSettingValue<int> m_altGlobalDownloadSpeedLimit;
+        CachedSettingValue<int> m_altGlobalUploadSpeedLimit;
+        CachedSettingValue<bool> m_isAltGlobalSpeedLimitEnabled;
+        CachedSettingValue<bool> m_isBandwidthSchedulerEnabled;
+        CachedSettingValue<uint> m_saveResumeDataInterval;
+        CachedSettingValue<int> m_port;
+        CachedSettingValue<bool> m_useRandomPort;
+        CachedSettingValue<QString> m_networkInterface;
+        CachedSettingValue<QString> m_networkInterfaceName;
+        CachedSettingValue<QString> m_networkInterfaceAddress;
+        CachedSettingValue<bool> m_isIPv6Enabled;
+        CachedSettingValue<int> m_encryption;
+        CachedSettingValue<bool> m_isForceProxyEnabled;
+        CachedSettingValue<bool> m_isProxyPeerConnectionsEnabled;
+        CachedSettingValue<QVariantMap> m_storedCategories;
+        CachedSettingValue<int> m_maxRatioAction;
+        CachedSettingValue<QString> m_defaultSavePath;
+        CachedSettingValue<QString> m_tempPath;
+        CachedSettingValue<bool> m_isSubcategoriesEnabled;
+        CachedSettingValue<bool> m_isTempPathEnabled;
+        CachedSettingValue<bool> m_isAutoTMMDisabledByDefault;
+        CachedSettingValue<bool> m_isDisableAutoTMMWhenCategoryChanged;
+        CachedSettingValue<bool> m_isDisableAutoTMMWhenDefaultSavePathChanged;
+        CachedSettingValue<bool> m_isDisableAutoTMMWhenCategorySavePathChanged;
+        CachedSettingValue<bool> m_isTrackerEnabled;
+        CachedSettingValue<QStringList> m_bannedIPs;
+
+        // Order is important. These need to be declared after their CachedSettingsValue
+        // counterparts, because they use them for initialization in the constructor
+        // initialization list.
+        const bool m_wasPexEnabled;
+        const bool m_wasTrackerExchangeEnabled;
+
         int m_numResumeData;
         int m_extraLimit;
-        bool m_appendLabelToSavePath;
-        bool m_appendExtension;
-        uint m_refreshInterval;
-        MaxRatioAction m_highRatioAction;
-        QList<BitTorrent::TrackerEntry> m_additionalTrackers;
-        QString m_defaultSavePath;
-        QString m_tempPath;
-        QString m_filterPath;
+        QList<BitTorrent::TrackerEntry> m_additionalTrackerList;
         QString m_resumeFolderPath;
         QFile m_resumeFolderLock;
         QHash<InfoHash, QString> m_savePathsToRemove;
+        bool m_useProxy;
 
         QTimer *m_refreshTimer;
         QTimer *m_bigRatioTimer;
@@ -376,13 +604,18 @@ namespace BitTorrent
         QHash<InfoHash, AddTorrentData> m_addingTorrents;
         QHash<QString, AddTorrentParams> m_downloadedTorrents;
         TorrentStatusReport m_torrentStatusReport;
+        QStringMap m_categories;
 
+#if LIBTORRENT_VERSION_NUM < 10100
         QMutex m_alertsMutex;
         QWaitCondition m_alertsWaitCondition;
-        QVector<libtorrent::alert *> m_alerts;
+        std::vector<libtorrent::alert *> m_alerts;
+#endif
 
         QNetworkConfigurationManager m_networkManager;
 
+        mutable QReadWriteLock m_lock;
+
         static Session *m_instance;
     };
 }

src/base/bittorrent/torrenthandle.cpp

@@ -60,7 +60,7 @@
 #include "trackerentry.h"
 #include "torrenthandle.h"
 
-static const char QB_EXT[] = ".!qB";
+const QString QB_EXT {".!qB"};
 
 namespace libt = libtorrent;
 using namespace BitTorrent;
@@ -80,7 +80,7 @@ AddTorrentData::AddTorrentData()
 AddTorrentData::AddTorrentData(const AddTorrentParams &params)
     : resumed(false)
     , name(params.name)
-    , label(params.label)
+    , category(params.category)
     , savePath(params.savePath)
     , disableTempPath(params.disableTempPath)
     , sequential(params.sequential)
@@ -199,9 +199,10 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
     , 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_label(data.label)
+    , m_category(data.category)
     , m_hasSeedStatus(data.hasSeedStatus)
     , m_ratioLimit(data.ratioLimit)
     , m_tempPathDisabled(data.disableTempPath)
@@ -209,19 +210,14 @@ TorrentHandle::TorrentHandle(Session *session, const libtorrent::torrent_handle
     , m_pauseAfterRecheck(false)
     , m_needSaveResumeData(false)
 {
-    Q_ASSERT(!m_savePath.isEmpty());
+    if (m_useAutoTMM)
+        m_savePath = Utils::Fs::toNativePath(m_session->categorySavePath(m_category));
 
     updateStatus();
     m_hash = InfoHash(m_nativeStatus.info_hash);
-    adjustActualSavePath();
 
-    if (!data.resumed) {
+    if (!data.resumed)
         setSequentialDownload(data.sequential);
-        if (hasMetadata()) {
-            if (m_session->isAppendExtensionEnabled())
-                appendExtensionsToIncompleteFiles();
-        }
-    }
 }
 
 TorrentHandle::~TorrentHandle() {}
@@ -330,6 +326,22 @@ QString TorrentHandle::contentPath(bool actual) const
         return rootPath(actual);
 }
 
+bool TorrentHandle::isAutoTMMEnabled() const
+{
+    return m_useAutoTMM;
+}
+
+void TorrentHandle::setAutoTMMEnabled(bool enabled)
+{
+    if (m_useAutoTMM == enabled) return;
+
+    m_useAutoTMM = enabled;
+    m_session->handleTorrentSavingModeChanged(this);
+
+    if (m_useAutoTMM)
+        move_impl(m_session->categorySavePath(m_category));
+}
+
 QString TorrentHandle::nativeActualSavePath() const
 {
     return Utils::String::fromStdString(m_nativeStatus.save_path);
@@ -507,9 +519,22 @@ qreal TorrentHandle::progress() const
     return progress;
 }
 
-QString TorrentHandle::label() const
+QString TorrentHandle::category() const
 {
-    return m_label;
+    return m_category;
+}
+
+bool TorrentHandle::belongsToCategory(const QString &category) const
+{
+    if (m_category.isEmpty()) return category.isEmpty();
+    if (!Session::isValidCategoryName(category)) return false;
+
+    if (m_category == category) return true;
+
+    if (m_session->isSubcategoriesEnabled() && m_category.startsWith(category + "/"))
+        return true;
+
+    return false;
 }
 
 QDateTime TorrentHandle::addedTime() const
@@ -572,25 +597,6 @@ QStringList TorrentHandle::absoluteFilePathsUnwanted() const
     return res;
 }
 
-QPair<int, int> TorrentHandle::fileExtremityPieces(int index) const
-{
-    if (!hasMetadata()) return qMakePair(-1, -1);
-
-    const int numPieces = piecesCount();
-    const qlonglong pieceSize = pieceLength();
-
-    // Determine the first and last piece of the file
-    int firstPiece = floor((m_torrentInfo.fileOffset(index) + 1) / (float) pieceSize);
-    Q_ASSERT((firstPiece >= 0) && (firstPiece < numPieces));
-
-    int numPiecesInFile = ceil(fileSize(index) / (float) pieceSize);
-    int lastPiece = firstPiece + numPiecesInFile - 1;
-    Q_ASSERT((lastPiece >= 0) && (lastPiece < numPieces));
-
-    Q_UNUSED(numPieces)
-    return qMakePair(firstPiece, lastPiece);
-}
-
 QVector<int> TorrentHandle::filePriorities() const
 {
     std::vector<int> fp;
@@ -708,13 +714,13 @@ bool TorrentHandle::hasFirstLastPiecePriority() const
     std::vector<int> fp;
     SAFE_GET(fp, file_priorities);
 
-    QPair<int, int> extremities;
+    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 = fileExtremityPieces(i);
+            extremities = info().filePieces(i);
             found = true;
             break;
         }
@@ -724,8 +730,8 @@ bool TorrentHandle::hasFirstLastPiecePriority() const
 
     int first = 0;
     int last = 0;
-    SAFE_GET(first, piece_priority, extremities.first);
-    SAFE_GET(last, piece_priority, extremities.second);
+    SAFE_GET(first, piece_priority, extremities.first());
+    SAFE_GET(last, piece_priority, extremities.last());
 
     return ((first == 7) && (last == 7));
 }
@@ -746,7 +752,7 @@ void TorrentHandle::updateState()
             m_state = isSeed() ? TorrentState::PausedUploading : TorrentState::PausedDownloading;
     }
     else {
-        if (m_session->isQueueingEnabled() && isQueued() && !isChecking()) {
+        if (m_session->isQueueingSystemEnabled() && isQueued() && !isChecking()) {
             m_state = isSeed() ? TorrentState::QueuedUploading : TorrentState::QueuedDownloading;
         }
         else {
@@ -1110,17 +1116,47 @@ void TorrentHandle::setName(const QString &name)
     }
 }
 
-void TorrentHandle::setLabel(const QString &label)
+bool TorrentHandle::setCategory(const QString &category)
 {
-    if (m_label != label) {
-        QString oldLabel = m_label;
-        m_label = label;
+    if (m_category != category) {
+        if (!category.isEmpty()) {
+            if (!Session::isValidCategoryName(category)) return false;
+            if (!m_session->categories().contains(category))
+                if (!m_session->addCategory(category))
+                    return false;
+        }
+
+        QString oldCategory = m_category;
+        m_category = category;
         m_needSaveResumeData = true;
-        m_session->handleTorrentLabelChanged(this, oldLabel);
+        m_session->handleTorrentCategoryChanged(this, oldCategory);
+
+        if (m_useAutoTMM) {
+            if (!m_session->isDisableAutoTMMWhenCategoryChanged())
+                move_impl(m_session->categorySavePath(m_category));
+            else
+                setAutoTMMEnabled(false);
+        }
     }
+
+    return true;
 }
 
 void TorrentHandle::move(QString path)
+{
+    m_useAutoTMM = false;
+    m_session->handleTorrentSavingModeChanged(this);
+
+    path = Utils::Fs::fromNativePath(path.trimmed());
+    if (path.isEmpty())
+        path = m_session->defaultSavePath();
+    if (!path.endsWith('/'))
+        path += '/';
+
+    move_impl(path);
+}
+
+void TorrentHandle::move_impl(QString path)
 {
     path = Utils::Fs::toNativePath(path);
     if (path == savePath()) return;
@@ -1190,13 +1226,13 @@ void TorrentHandle::setFirstLastPiecePriority(bool b)
             // Determine the priority to set
             int prio = b ? 7 : fp[index];
 
-            QPair<int, int> extremities = fileExtremityPieces(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.second - i] = prio;
+                pp[extremities.first() + i] = prio;
+                pp[extremities.last() - i] = prio;
             }
         }
     }
@@ -1248,10 +1284,6 @@ void TorrentHandle::moveStorage(const QString &newPath)
         if (QDir(oldPath) == QDir(newPath)) return;
 
         qDebug("move storage: %s to %s", qPrintable(oldPath), qPrintable(newPath));
-        // Create destination directory if necessary
-        // or move_storage() will fail...
-        QDir().mkpath(newPath);
-
         try {
             // Actually move the storage
             m_nativeHandle.move_storage(newPath.toUtf8().constData());
@@ -1337,7 +1369,7 @@ void TorrentHandle::handleStorageMovedAlert(libtorrent::storage_moved_alert *p)
 
     // Attempt to remove old folder if empty
     QDir oldSaveDir(Utils::Fs::fromNativePath(m_oldPath));
-    if ((oldSaveDir != QDir(m_session->defaultSavePath())) && (oldSaveDir != QDir(m_session->tempPath()))) {
+    if (oldSaveDir != QDir(m_session->defaultSavePath())) {
         qDebug("Attempting to remove %s", qPrintable(m_oldPath));
         QDir().rmpath(m_oldPath);
     }
@@ -1414,6 +1446,7 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert
         m_hasSeedStatus = true;
 
     adjustActualSavePath();
+    manageIncompleteFiles();
 
     if (m_pauseAfterRecheck) {
         m_pauseAfterRecheck = false;
@@ -1435,13 +1468,19 @@ void TorrentHandle::handleTorrentFinishedAlert(libtorrent::torrent_finished_aler
     m_hasSeedStatus = true;
 
     adjustActualSavePath();
-    if (Preferences::instance()->recheckTorrentsOnCompletion())
-        forceRecheck();
+    manageIncompleteFiles();
 
-    if (isMoveInProgress() || m_renameCount > 0)
+    const bool recheckTorrentsOnCompletion = Preferences::instance()->recheckTorrentsOnCompletion();
+    if (isMoveInProgress() || m_renameCount > 0) {
+        if (recheckTorrentsOnCompletion)
+            m_moveFinishedTriggers.append(boost::bind(&TorrentHandle::forceRecheck, this));
         m_moveFinishedTriggers.append(boost::bind(&Session::handleTorrentFinished, m_session, this));
-    else
+    }
+    else {
+        if (recheckTorrentsOnCompletion)
+            forceRecheck();
         m_session->handleTorrentFinished(this);
+    }
 }
 
 void TorrentHandle::handleTorrentPausedAlert(libtorrent::torrent_paused_alert *p)
@@ -1469,9 +1508,9 @@ void TorrentHandle::handleSaveResumeDataAlert(libtorrent::save_resume_data_alert
         resumeData["qBt-paused"] = isPaused();
         resumeData["qBt-forced"] = isForced();
     }
-    resumeData["qBt-savePath"] = Utils::String::toStdString(m_savePath);
+    resumeData["qBt-savePath"] = m_useAutoTMM ? "" : Utils::String::toStdString(m_savePath);
     resumeData["qBt-ratioLimit"] = Utils::String::toStdString(QString::number(m_ratioLimit));
-    resumeData["qBt-label"] = Utils::String::toStdString(m_label);
+    resumeData["qBt-category"] = Utils::String::toStdString(m_category);
     resumeData["qBt-name"] = Utils::String::toStdString(m_name);
     resumeData["qBt-seedStatus"] = m_hasSeedStatus;
     resumeData["qBt-tempPathDisabled"] = m_tempPathDisabled;
@@ -1532,12 +1571,6 @@ void TorrentHandle::handleFileRenamedAlert(libtorrent::file_renamed_alert *p)
 
     updateStatus();
 
-    if (filesCount() == 1) {
-        // Single-file torrent
-        // Renaming a file corresponds to changing the save path
-        m_session->handleTorrentSavePathChanged(this);
-    }
-
     --m_renameCount;
     while (!isMoveInProgress() && (m_renameCount == 0) && !m_moveFinishedTriggers.isEmpty())
         m_moveFinishedTriggers.takeFirst()();
@@ -1561,7 +1594,7 @@ void TorrentHandle::handleFileCompletedAlert(libtorrent::file_completed_alert *p
         QString name = filePath(p->index);
         if (name.endsWith(QB_EXT)) {
             const QString oldName = name;
-            name.chop(QString(QB_EXT).size());
+            name.chop(QB_EXT.size());
             qDebug("Renaming %s to %s", qPrintable(oldName), qPrintable(name));
             renameFile(p->index, name);
         }
@@ -1582,7 +1615,7 @@ void TorrentHandle::handleMetadataReceivedAlert(libt::metadata_received_alert *p
     qDebug("Metadata received for torrent %s.", qPrintable(name()));
     updateStatus();
     if (m_session->isAppendExtensionEnabled())
-        appendExtensionsToIncompleteFiles();
+        manageIncompleteFiles();
     m_session->handleTorrentMetadataReceived(this);
 
     if (isPaused()) {
@@ -1598,14 +1631,17 @@ void TorrentHandle::handleTempPathChanged()
     adjustActualSavePath();
 }
 
+void TorrentHandle::handleCategorySavePathChanged()
+{
+    if (m_useAutoTMM)
+        move_impl(m_session->categorySavePath(m_category));
+}
+
 void TorrentHandle::handleAppendExtensionToggled()
 {
     if (!hasMetadata()) return;
 
-    if (m_session->isAppendExtensionEnabled())
-        appendExtensionsToIncompleteFiles();
-    else
-        removeExtensionsFromIncompleteFiles();
+    manageIncompleteFiles();
 }
 
 void TorrentHandle::handleAlert(libtorrent::alert *a)
@@ -1662,30 +1698,26 @@ void TorrentHandle::handleAlert(libtorrent::alert *a)
     }
 }
 
-void TorrentHandle::appendExtensionsToIncompleteFiles()
+void TorrentHandle::manageIncompleteFiles()
 {
+    const bool isAppendExtensionEnabled = m_session->isAppendExtensionEnabled();
     QVector<qreal> fp = filesProgress();
     for (int i = 0; i < filesCount(); ++i) {
-        if ((fileSize(i) > 0) && (fp[i] < 1)) {
-            const QString name = filePath(i);
+        QString name = filePath(i);
+        if (isAppendExtensionEnabled && (fileSize(i) > 0) && (fp[i] < 1)) {
             if (!name.endsWith(QB_EXT)) {
                 const QString newName = name + QB_EXT;
-                qDebug("Renaming %s to %s", qPrintable(name), qPrintable(newName));
+                qDebug() << "Renaming" << name << "to" << newName;
                 renameFile(i, newName);
             }
         }
-    }
-}
-
-void TorrentHandle::removeExtensionsFromIncompleteFiles()
-{
-    for (int i = 0; i < filesCount(); ++i) {
-        QString name = filePath(i);
-        if (name.endsWith(QB_EXT)) {
-            const QString oldName = name;
-            name.chop(QString(QB_EXT).size());
-            qDebug("Renaming %s to %s", qPrintable(oldName), qPrintable(name));
-            renameFile(i, name);
+        else {
+            if (name.endsWith(QB_EXT)) {
+                const QString oldName = name;
+                name.chop(QB_EXT.size());
+                qDebug() << "Renaming" << oldName << "to" << name;
+                renameFile(i, name);
+            }
         }
     }
 }
@@ -1708,8 +1740,8 @@ void TorrentHandle::adjustActualSavePath_impl()
     }
     else {
         // Moving all downloading torrents to temporary save path
-        path = m_session->tempPath();
-        qDebug("Moving torrent to its temp save path: %s", qPrintable(path));
+        path = m_session->torrentTempPath(hash());
+        qDebug() << "Moving torrent to its temp save path:" << path;
     }
 
     moveStorage(Utils::Fs::toNativePath(path));

src/base/bittorrent/torrenthandle.h

@@ -54,6 +54,8 @@ class QBitArray;
 class QStringList;
 template<typename T, typename U> struct QPair;
 
+extern const QString QB_EXT;
+
 namespace libtorrent
 {
     class alert;
@@ -90,7 +92,7 @@ namespace BitTorrent
         bool resumed;
         // for both new and resumed torrents
         QString name;
-        QString label;
+        QString category;
         QString savePath;
         bool disableTempPath;
         bool sequential;
@@ -227,11 +229,16 @@ namespace BitTorrent
         QString rootPath(bool actual = false) const;
         QString contentPath(bool actual = false) const;
 
+        bool isAutoTMMEnabled() const;
+        void setAutoTMMEnabled(bool enabled);
+        QString category() const;
+        bool belongsToCategory(const QString &category) const;
+        bool setCategory(const QString &category);
+
         int filesCount() const;
         int piecesCount() const;
         int piecesHave() const;
         qreal progress() const;
-        QString label() const;
         QDateTime addedTime() const;
         qreal ratioLimit() const;
 
@@ -240,7 +247,6 @@ namespace BitTorrent
         qlonglong fileSize(int index) const;
         QStringList absoluteFilePaths() const;
         QStringList absoluteFilePathsUnwanted() const;
-        QPair<int, int> fileExtremityPieces(int index) const;
         QVector<int> filePriorities() const;
 
         TorrentInfo info() const;
@@ -307,7 +313,6 @@ namespace BitTorrent
         qlonglong nextAnnounce() const;
 
         void setName(const QString &name);
-        void setLabel(const QString &label);
         void setSequentialDownload(bool b);
         void toggleSequentialDownload();
         void setFirstLastPiecePriority(bool b);
@@ -344,6 +349,7 @@ namespace BitTorrent
         void handleAlert(libtorrent::alert *a);
         void handleStateUpdate(const libtorrent::torrent_status &nativeStatus);
         void handleTempPathChanged();
+        void handleCategorySavePathChanged();
         void handleAppendExtensionToggled();
         void saveResumeData();
 
@@ -379,9 +385,9 @@ namespace BitTorrent
 
         void adjustActualSavePath();
         void adjustActualSavePath_impl();
+        void move_impl(QString path);
         void moveStorage(const QString &newPath);
-        void appendExtensionsToIncompleteFiles();
-        void removeExtensionsFromIncompleteFiles();
+        void manageIncompleteFiles();
         bool addTracker(const TrackerEntry &tracker);
         bool addUrlSeed(const QUrl &urlSeed);
         bool removeUrlSeed(const QUrl &urlSeed);
@@ -405,10 +411,12 @@ namespace BitTorrent
         QQueue<EventTrigger> m_moveFinishedTriggers;
         int m_renameCount;
 
+        bool m_useAutoTMM;
+
         // Persistent data
         QString m_name;
         QString m_savePath;
-        QString m_label;
+        QString m_category;
         bool m_hasSeedStatus;
         qreal m_ratioLimit;
         bool m_tempPathDisabled;

src/base/bittorrent/torrentinfo.cpp

@@ -26,6 +26,7 @@
  * exception statement from your version.
  */
 
+#include <QDebug>
 #include <QString>
 #include <QList>
 #include <QUrl>
@@ -44,8 +45,8 @@ namespace libt = libtorrent;
 using namespace BitTorrent;
 
 TorrentInfo::TorrentInfo(NativeConstPtr nativeInfo)
-    : m_nativeInfo(nativeInfo)
 {
+    m_nativeInfo = boost::const_pointer_cast<libt::torrent_info>(nativeInfo);
 }
 
 TorrentInfo::TorrentInfo(const TorrentInfo &other)
@@ -138,6 +139,12 @@ int TorrentInfo::pieceLength() const
     return m_nativeInfo->piece_length();
 }
 
+int TorrentInfo::pieceLength(int index) const
+{
+    if (!isValid()) return -1;
+    return m_nativeInfo->piece_size(index);
+}
+
 int TorrentInfo::piecesCount() const
 {
     if (!isValid()) return -1;
@@ -178,7 +185,7 @@ qlonglong TorrentInfo::fileSize(int index) const
 
 qlonglong TorrentInfo::fileOffset(int index) const
 {
-    if (!isValid()) return  -1;
+    if (!isValid()) return -1;
     return m_nativeInfo->file_at(index).offset;
 }
 
@@ -213,25 +220,80 @@ QByteArray TorrentInfo::metadata() const
 
 QStringList TorrentInfo::filesForPiece(int pieceIndex) const
 {
-    if (pieceIndex < 0)
-        return QStringList();
+    // no checks here because fileIndicesForPiece() will return an empty list
+    QVector<int> fileIndices = fileIndicesForPiece(pieceIndex);
 
-    std::vector<libtorrent::file_slice> files(
-        nativeInfo()->map_block(pieceIndex, 0, nativeInfo()->piece_size(pieceIndex)));
     QStringList res;
-    for (const libtorrent::file_slice& s: files) {
-        res.append(filePath(s.file_index));
-    }
+    res.reserve(fileIndices.size());
+    std::transform(fileIndices.begin(), fileIndices.end(), std::back_inserter(res),
+        [this](int i) { return filePath(i); });
+
     return res;
 }
 
+QVector<int> TorrentInfo::fileIndicesForPiece(int pieceIndex) const
+{
+    if (!isValid() || (pieceIndex < 0) || (pieceIndex >= piecesCount()))
+        return QVector<int>();
+
+    std::vector<libt::file_slice> files(
+        nativeInfo()->map_block(pieceIndex, 0, nativeInfo()->piece_size(pieceIndex)));
+    QVector<int> res;
+    res.reserve(int(files.size()));
+    std::transform(files.begin(), files.end(), std::back_inserter(res),
+        [](const libt::file_slice &s) { return s.file_index; });
+
+    return res;
+}
+
+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 {};
+
+    int index = fileIndex(file);
+    if (index == -1) {
+        qDebug() << "Filename" << file << "was not found in torrent" << name();
+        return {};
+    }
+    return filePieces(index);
+}
+
+TorrentInfo::PieceRange TorrentInfo::filePieces(int fileIndex) const
+{
+    if (!isValid())
+        return {};
+
+    if ((fileIndex < 0) || (fileIndex >= filesCount())) {
+        qDebug() << "File index (" << fileIndex << ") is out of range for torrent" << name();
+        return {};
+    }
+
+    const libt::file_storage &files = nativeInfo()->files();
+    const auto fileSize = files.file_size(fileIndex);
+    const auto firstOffset = files.file_offset(fileIndex);
+    return makeInterval(static_cast<int>(firstOffset / pieceLength()),
+                        static_cast<int>((firstOffset + fileSize - 1) / pieceLength()));
+}
+
 void TorrentInfo::renameFile(uint index, const QString &newPath)
 {
     if (!isValid()) return;
     nativeInfo()->rename_file(index, Utils::String::toStdString(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
+    for (int i = 0; i < filesCount(); ++i)
+        if (fileName == filePath(i))
+            return i;
+
+    return -1;
+}
+
 TorrentInfo::NativePtr TorrentInfo::nativeInfo() const
 {
-    return *reinterpret_cast<const NativePtr *>(&m_nativeInfo);
+    return m_nativeInfo;
 }

src/base/bittorrent/torrentinfo.h

@@ -34,12 +34,15 @@
 #include <libtorrent/torrent_info.hpp>
 #include <libtorrent/version.hpp>
 
+#include "base/indexrange.h"
+
 class QString;
 class QUrl;
 class QDateTime;
 class QStringList;
 class QByteArray;
 template<typename T> class QList;
+template<typename T> class QVector;
 
 namespace BitTorrent
 {
@@ -75,6 +78,7 @@ namespace BitTorrent
         qlonglong totalSize() const;
         int filesCount() const;
         int pieceLength() const;
+        int pieceLength(int index) const;
         int piecesCount() const;
         QString filePath(int index) const;
         QStringList filePaths() const;
@@ -86,13 +90,22 @@ namespace BitTorrent
         QList<QUrl> urlSeeds() const;
         QByteArray metadata() const;
         QStringList filesForPiece(int pieceIndex) const;
+        QVector<int> fileIndicesForPiece(int pieceIndex) const;
+
+        using PieceRange = IndexRange<int>;
+        // returns pair of the first and the last pieces into which
+        // the given file extends (maybe partially).
+        PieceRange filePieces(const QString &file) const;
+        PieceRange filePieces(int fileIndex) const;
 
         void renameFile(uint index, const QString &newPath);
 
         NativePtr nativeInfo() const;
 
     private:
-        NativeConstPtr m_nativeInfo;
+        // returns file index or -1 if fileName is not found
+        int fileIndex(const QString &fileName) const;
+        NativePtr m_nativeInfo;
     };
 }
 

src/base/http/server.cpp

@@ -91,6 +91,7 @@ void Server::incomingConnection(int socketDescriptor)
 #else
             static_cast<QSslSocket*>(serverSocket)->setLocalCertificate(m_certificates.first());
 #endif
+            static_cast<QSslSocket*>(serverSocket)->setPeerVerifyMode(QSslSocket::VerifyNone);
             static_cast<QSslSocket*>(serverSocket)->startServerEncryption();
         }
 #endif

src/base/http/types.h

@@ -34,7 +34,7 @@
 #include <QHostAddress>
 #include <QVector>
 
-typedef QMap<QString, QString> QStringMap;
+#include "base/types.h"
 
 namespace Http
 {

src/base/indexrange.h

@@ -0,0 +1,130 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2016  Eugene Shalygin
+ *
+ * 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 QBT_INDEXRANGE_H
+#define QBT_INDEXRANGE_H
+
+#include <QtGlobal>
+
+// Interval is defined via [first;last]
+template <typename Index>
+class IndexInterval
+{
+public:
+    using IndexType = Index;
+
+    IndexInterval(IndexType first, IndexType last)
+        : m_first {first}
+        , m_last {last}
+    {
+        Q_ASSERT(first <= last);
+    }
+
+    IndexType first() const
+    {
+        return m_first;
+    }
+
+    IndexType last() const
+    {
+        return m_last;
+    }
+
+private:
+    IndexType m_first;
+    IndexType m_last;
+};
+
+template <typename T>
+inline IndexInterval<T> makeInterval(T first, T last)
+{
+    return {first, last};
+}
+
+// range is defined via first index and size
+template <typename Index, typename IndexDiff = Index>
+class IndexRange
+{
+public:
+    using IndexType = Index;
+    using IndexDiffType = IndexDiff;
+
+    constexpr IndexRange()
+        : m_first {0}
+        , m_size {0}
+    {
+    }
+
+    constexpr IndexRange(IndexType first, IndexDiffType size)
+        : m_first {first}
+        , m_size {size}
+    {
+    }
+
+    constexpr IndexRange(const IndexInterval<IndexType> &interval)
+        : m_first {interval.first()}
+        , m_size {interval.last() - interval.first() + 1}
+    {
+    }
+
+    constexpr IndexType begin() const
+    {
+        return m_first;
+    }
+
+    constexpr IndexType end() const
+    {
+        return m_first + m_size;
+    }
+
+    constexpr IndexDiffType size() const
+    {
+        return m_size;
+    }
+
+    constexpr IndexType first() const
+    {
+        return m_first;
+    }
+
+    constexpr IndexType last() const
+    {
+        return m_first + m_size - 1;
+    }
+
+    constexpr bool isEmpty() const
+    {
+        return m_size == 0;
+    }
+
+private:
+    IndexType m_first;
+    IndexDiffType m_size;
+};
+
+#endif // QBT_INDEXRANGE_H

src/base/net/downloadmanager.cpp

@@ -27,20 +27,21 @@
  * exception statement from your version.
  */
 
+#include "downloadmanager.h"
+
 #include <QDateTime>
-#include <QNetworkRequest>
-#include <QNetworkProxy>
-#include <QNetworkCookieJar>
-#include <QNetworkReply>
+#include <QDebug>
 #include <QNetworkCookie>
 #include <QNetworkCookieJar>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QSslError>
 #include <QUrl>
-#include <QDebug>
 
 #include "base/preferences.h"
 #include "downloadhandler.h"
-#include "downloadmanager.h"
+#include "proxyconfigurationmanager.h"
 
 // Spoof Firefox 38 user agent to avoid web server banning
 const char DEFAULT_USER_AGENT[] = "Mozilla/5.0 (X11; Linux i686; rv:38.0) Gecko/20100101 Firefox/38.0";
@@ -75,6 +76,9 @@ namespace
             Preferences::instance()->setNetworkCookies(cookies);
         }
 
+        using QNetworkCookieJar::allCookies;
+        using QNetworkCookieJar::setAllCookies;
+
 #ifndef QBT_USES_QT5
         virtual bool deleteCookie(const QNetworkCookie &cookie)
         {
@@ -188,6 +192,16 @@ bool DownloadManager::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList,
     return m_networkManager.cookieJar()->setCookiesFromUrl(cookieList, url);
 }
 
+QList<QNetworkCookie> DownloadManager::allCookies() const
+{
+    return static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->allCookies();
+}
+
+void DownloadManager::setAllCookies(const QList<QNetworkCookie> &cookieList)
+{
+    static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->setAllCookies(cookieList);
+}
+
 bool DownloadManager::deleteCookie(const QNetworkCookie &cookie)
 {
     return static_cast<NetworkCookieJar *>(m_networkManager.cookieJar())->deleteCookie(cookie);
@@ -195,16 +209,16 @@ bool DownloadManager::deleteCookie(const QNetworkCookie &cookie)
 
 void DownloadManager::applyProxySettings()
 {
+    auto proxyManager = ProxyConfigurationManager::instance();
+    ProxyConfiguration proxyConfig = proxyManager->proxyConfiguration();
     QNetworkProxy proxy;
-    const Preferences* const pref = Preferences::instance();
 
-    if (pref->isProxyEnabled() && !pref->isProxyOnlyForTorrents()) {
+    if (!proxyManager->isProxyOnlyForTorrents() && (proxyConfig.type != ProxyType::None)) {
         // Proxy enabled
-        proxy.setHostName(pref->getProxyIp());
-        proxy.setPort(pref->getProxyPort());
+        proxy.setHostName(proxyConfig.ip);
+        proxy.setPort(proxyConfig.port);
         // Default proxy type is HTTP, we must change if it is SOCKS5
-        const int proxyType = pref->getProxyType();
-        if ((proxyType == Proxy::SOCKS5) || (proxyType == Proxy::SOCKS5_PW)) {
+        if ((proxyConfig.type == ProxyType::SOCKS5) || (proxyConfig.type == ProxyType::SOCKS5_PW)) {
             qDebug() << Q_FUNC_INFO << "using SOCKS proxy";
             proxy.setType(QNetworkProxy::Socks5Proxy);
         }
@@ -213,10 +227,10 @@ void DownloadManager::applyProxySettings()
             proxy.setType(QNetworkProxy::HttpProxy);
         }
         // Authentication?
-        if (pref->isProxyAuthEnabled()) {
+        if (proxyManager->isAuthenticationRequired()) {
             qDebug("Proxy requires authentication, authenticating");
-            proxy.setUser(pref->getProxyUsername());
-            proxy.setPassword(pref->getProxyPassword());
+            proxy.setUser(proxyConfig.username);
+            proxy.setPassword(proxyConfig.password);
         }
     }
     else {

src/base/net/downloadmanager.h

@@ -54,6 +54,8 @@ namespace Net
         DownloadHandler *downloadUrl(const QString &url, bool saveToFile = false, qint64 limit = 0, bool handleRedirectToMagnet = false, const QString &userAgent = "");
         QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
         bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
+        QList<QNetworkCookie> allCookies() const;
+        void setAllCookies(const QList<QNetworkCookie> &cookieList);
         bool deleteCookie(const QNetworkCookie &cookie);
 
     private slots: