Bump to 4.3.3

`QStorageInfo::bytesAvailable()` is guaranteed to return `-1` for an
invalid path.
https://doc.qt.io/qt-5/qstorageinfo.html#bytesAvailable

.github/workflows/ci.yaml

@@ -72,7 +72,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Ubuntu_${{ matrix.os }}-${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
           build/target_graph.dot
@@ -151,7 +151,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Windows_x64-static-release
+        name: qBittorrent-CI_Windows-x64
         path: |
           build/compile_commands.json
           build/target_graph.dot
@@ -200,10 +200,10 @@ jobs:
           -Value "set(VCPKG_BUILD_TYPE release)","set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)"
 
     # NOTE: Avoids a libtorrent ABI issue. See https://github.com/arvidn/libtorrent/issues/4965
-    - name: force AppleClang to compile libtorrent with C++14
+    - name: force AppleClang to compile libtorrent with C++17
       run: |
         (Get-Content -path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake).Replace( `
-          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=14') `
+          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=17') `
           | Set-Content -Path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake
 
     - name: install dependencies via vcpkg
@@ -236,7 +236,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-macOS_x64-static-release_${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
           build/target_graph.dot

.github/workflows/file_health.sh

@@ -12,6 +12,7 @@ regressions=0
 exclusions_nonutf8='(.*(7z|gif|ic(ns|o)|png|qm|zip))'
 exclusions_bom='src/base/unicodestrings.h'
 exclusions_tw='(*.ts)|src/webui/www/private/scripts/lib/mootools-1.2-more.js'
+exclusions_trailing_newline='configure'
 exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/mootools-1.2-(core-yc.js|more.js)'
 
 echo -e "\n*** Detect files not encoded in UTF-8 ***\n"
@@ -50,6 +51,7 @@ echo -e "\n*** Detect too many trailing newlines ***\n"
 
 find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
     | grep -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
+    | grep -E -v -e "${exclusions_trailing_newline}" \
     | xargs -L1 -I my_input bash -c 'test "$(tail -q -c2 "my_input" | hexdump -C | grep "0a 0a")" && echo "my_input"' \
     | tee >(echo -e "--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'

.gitignore

@@ -4,6 +4,7 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
+src/base/version.h
 CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri

.travis.yml

@@ -129,7 +129,7 @@ install:
 
       cmake \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=14 \
+        -DCMAKE_CXX_STANDARD=17 \
         -Ddeprecated-functions=OFF \
         -DOPENSSL_ROOT_DIR="$openssl_root_path" \
         ./
@@ -145,7 +145,7 @@ install:
 
       cmake \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_CXX_STANDARD=14 \
+        -DCMAKE_CXX_STANDARD=17 \
         -Ddeprecated-functions=ON \
         -DOPENSSL_ROOT_DIR="$openssl_root_path" \
         ./

CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default t
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
 project(qBittorrent
-    VERSION 4.3.2.0
     DESCRIPTION "The qBittorrent BitTorrent client"
     HOMEPAGE_URL "https://www.qbittorrent.org/"
     LANGUAGES CXX
@@ -51,8 +50,6 @@ elseif (MSVC)
     feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
 endif()
 
-set(QBT_VER_STATUS "alpha1" CACHE STRING "Project status version. Should be empty for release builds.")
-
 include(GNUInstallDirs)
 add_subdirectory(src)
 add_subdirectory(dist)
@@ -62,3 +59,7 @@ if (VERBOSE_CONFIGURE)
 else()
     feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
 endif()
+
+# Generate version header
+file(READ "src/base/version.h.in" versionHeader)
+file(WRITE "src/base/version.h" "${versionHeader}")

Changelog

@@ -1,3 +1,21 @@
+Tue Jan 19 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.3
+    - FEATURE: New languages: Azerbaijani, Estonian
+    - BUGFIX: Unify global speed dialogs for normal/alternative speeds (thalieht)
+    - BUGFIX: Increase maximum global speed limits ~2 GiB/s (thalieht)
+    - BUGFIX: Save fastresume when setting torrent speed limits (thalieht)
+    - BUGFIX: Group several torrent options into one dialog (thalieht)
+    - BUGFIX: Capitalize locale names (Chocobo1)
+    - BUGFIX: Improve content file/folder names handling (glassez)
+    - BUGFIX: Drop notification about move storage finished or failed (glassez)
+    - BUGFIX: Reload "missing files" torrent instead of re-checking (glassez)
+    - BUGFIX: Remember dialog sizes (Chocobo1)
+    - BUGFIX: Improve detection of file extension string (Chocobo1)
+    - WEBUI: Don't call non-existent elements (glassez)
+    - WEBUI: Update "Keep top-level folder" in WebUI options (thalieht)
+    - MACOS: QMake: Raise minimal macOS target version to 10.14 (glassez)
+    - LINUX: Use legacy 'data' directory only as a fallback (lbilli)
+    - OTHER: Bump project requirement to C++17 (Chocobo1)
+
 Sun Dec 27 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.2
     - FEATURE: Allow to add root folder to torrent content (glassez)
     - FEATURE: "HTTPS tracker validation" option is available on all platforms with latest libtorrent (Chocobo1)

build_dist.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# get version numbers
+versionSrc="src/base/version.h.in"
+versionMajor="$(grep -Po '(?<=QBT_VERSION_MAJOR )\d+' "$versionSrc")"
+versionMinor="$(grep -Po '(?<=QBT_VERSION_MINOR )\d+' "$versionSrc")"
+versionBugfix="$(grep -Po '(?<=QBT_VERSION_BUGFIX )\d+' "$versionSrc")"
+versionBuild="$(grep -Po '(?<=QBT_VERSION_BUILD )\d+' "$versionSrc")"
+versionStatus="$(grep -Po '(?<=QBT_VERSION_STATUS ")\w+' "$versionSrc")"
+
+if [ "$versionBuild" != "0" ]; then
+    projectVersion="$versionMajor.$versionMinor.$versionBugfix.$versionBuild$versionStatus"
+else
+    projectVersion="$versionMajor.$versionMinor.$versionBugfix$versionStatus"
+fi
+
+# pack archives
+git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | gzip -9 > "qbittorrent-$projectVersion.tar.gz"
+git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | xz -9 > "qbittorrent-$projectVersion.tar.xz"

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -7,47 +7,16 @@ macro(qbt_common_config)
     # treat value specified by the CXX_STANDARD target property as a requirement by default
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-    # these definitions are only needed for calls to
-    # lt::generate_fingerprint and for the qbittorrent.rc file on Windows
-    add_library(qbt_version_definitions INTERFACE)
-
-    target_compile_definitions(qbt_version_definitions INTERFACE
-        QBT_VERSION_MAJOR=${qBittorrent_VERSION_MAJOR}
-        QBT_VERSION_MINOR=${qBittorrent_VERSION_MINOR}
-        QBT_VERSION_BUGFIX=${qBittorrent_VERSION_PATCH}
-        QBT_VERSION_BUILD=${qBittorrent_VERSION_TWEAK}
-    )
-
     add_library(qbt_common_cfg INTERFACE)
 
-    # Full C++ 14 support is required
+    # Full C++ 17 support is required
     # See also https://cmake.org/cmake/help/latest/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
     # for a breakdown of the features that CMake recognizes for each C++ standard
     target_compile_features(qbt_common_cfg INTERFACE
-        cxx_std_14
-        cxx_aggregate_default_initializers
-        cxx_attribute_deprecated
-        cxx_binary_literals
-        cxx_contextual_conversions
-        cxx_decltype_auto
-        cxx_digit_separators
-        cxx_generic_lambdas
-        cxx_lambda_init_captures
-        cxx_relaxed_constexpr
-        cxx_return_type_deduction
-        cxx_variable_templates
+        cxx_std_17
     )
 
-    set(QBT_PROJECT_VERSION "${qBittorrent_VERSION_MAJOR}.${qBittorrent_VERSION_MINOR}.${qBittorrent_VERSION_PATCH}")
-    if (NOT ${qBittorrent_VERSION_TWEAK} EQUAL 0)
-        set(QBT_PROJECT_VERSION "${QBT_PROJECT_VERSION}.${qBittorrent_VERSION_TWEAK}")
-    endif()
-
-    set(QBT_FULL_VERSION "${QBT_PROJECT_VERSION}${QBT_VER_STATUS}")
-
     target_compile_definitions(qbt_common_cfg INTERFACE
-        QBT_VERSION="v${QBT_FULL_VERSION}"
-        QBT_VERSION_2="${QBT_FULL_VERSION}"
         QT_DEPRECATED_WARNINGS
         QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
@@ -90,6 +59,12 @@ macro(qbt_common_config)
         endif()
     endif()
 
+    if ((CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+        target_compile_options(qbt_common_cfg INTERFACE
+            -Wno-range-loop-analysis
+        )
+    endif()
+
     if (MINGW)
         target_link_options(qbt_common_cfg INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:LINKER:--dynamicbase>)
     endif()
@@ -101,8 +76,12 @@ macro(qbt_common_config)
     endif()
 
     if (MSVC)
-        target_compile_options(qbt_common_cfg INTERFACE /guard:cf)
-        target_link_options(qbt_common_cfg INTERFACE /guard:cf
+        target_compile_options(qbt_common_cfg INTERFACE
+            /guard:cf
+            /utf-8
+        )
+        target_link_options(qbt_common_cfg INTERFACE
+            /guard:cf
             $<$<NOT:$<CONFIG:Debug>>:/OPT:REF /OPT:ICF>
             # suppress linking warning due to /INCREMENTAL and /OPT:ICF being both ON
             $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL:NO>

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.3.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.3.3], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}
@@ -194,34 +194,34 @@ PKG_CHECK_MODULES(zlib,
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
+# Check if already in >= C++17 mode because of the flags returned by one of the above packages
 TMP_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=""
-AC_MSG_CHECKING([if compiler defaults to C++14 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+AC_MSG_CHECKING([if compiler defaults to C++17 or later mode])
+AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                   [AC_MSG_RESULT([yes])
-                   QBT_CXX14_FOUND="yes"],
+                   QBT_CXX17_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX14_FOUND="no"])
+                   QBT_CXX17_FOUND="no"])
 
-# In case of no, check if the compiler can support at least C++14
+# In case of no, check if the compiler can support at least C++17
 # and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++14])
-       CXXFLAGS="-std=c++14"
-       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
+      [AC_MSG_CHECKING([if compiler supports C++17])
+       CXXFLAGS="-std=c++17"
+       AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                         [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags])
+                         AC_MSG_CHECKING([if C++17 is disabled by the set compiler flags])
                          # prepend the flag so it won't override conflicting user defined flags
-                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+                         CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
+                         AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
-                                            AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
+                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
+                                            AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
                                            [AC_MSG_RESULT([yes])
-                                            AC_MSG_ERROR([The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode.])])],
+                                            AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])],
                         [AC_MSG_RESULT([no])
-                         AC_MSG_ERROR([A compiler supporting C++14 is required.])])
+                         AC_MSG_ERROR([A compiler supporting C++17 is required.])])
       ])
 CXXFLAGS="$TMP_CXXFLAGS"
 
@@ -272,9 +272,13 @@ AC_SUBST(QBT_REMOVE_CONFIG)
 AC_SUBST(QBT_ADD_DEFINES)
 AC_SUBST(QBT_REMOVE_DEFINES)
 
-AC_OUTPUT(conf.pri)
+QBT_CONFIG_FILES="conf.pri"
+
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
+      [QBT_CONFIG_FILES="$QBT_CONFIG_FILES dist/unix/systemd/qbittorrent-nox@.service"])
+
+AC_CONFIG_FILES(["$QBT_CONFIG_FILES"])
+AC_OUTPUT
 
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
 TOPDIR="$(cd "$(dirname "$0")" && pwd)"

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.2</string>
+	<string>4.3.3</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2020 The qBittorrent project</string>
+	<string>Copyright © 2006-2021 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/org.qbittorrent.qBittorrent.appdata.xml

@@ -74,6 +74,6 @@
   <url type="translate">https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent</url>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="4.3.2" date="2020-12-27"/>
+    <release version="4.3.3" date="2021-01-19"/>
   </releases>
 </component>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -12,6 +12,9 @@ StartupNotify=false
 StartupWMClass=qbittorrent
 Keywords=bittorrent;torrent;magnet;download;p2p;
 
+# Translations
+
+
 # Translations
 Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
 GenericName[oc]=Client BitTorrent
@@ -85,6 +88,9 @@ Name[hr]=qBittorrent
 Comment[hu]=Fájlok letöltése és megosztása a BitTorrent hálózaton keresztül
 GenericName[hu]=BitTorrent kliens
 Name[hu]=qBittorrent
+Comment[hy]=Նիշքերի փոխանցում BitTorrent-ի միջոցով
+GenericName[hy]=BitTorrent սպասառու
+Name[hy]=qBittorrent
 Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
 GenericName[id]=Klien BitTorrent
 Name[id]=qBittorrent
@@ -100,8 +106,8 @@ Name[ja]=qBittorrent
 Comment[ka]=ჩამოტვირთე და გააზიარე ფაილები Bittorrent-ის საშუალებით
 GenericName[ka]=BitTorrent კლიენტი
 Name[ka]=qBittorrent
-Comment[ko]=비트토런트를 통해 파일을 받고 공유합니다
-GenericName[ko]=비트토런트 클라이언트
+Comment[ko]=비트토렌트를 통해 파일을 받고 공유합니다
+GenericName[ko]=비트토렌트 클라이언트
 Name[ko]=qBittorrent
 Comment[zh]=通过 BitTorrent 下载和分享文件
 GenericName[zh]=BitTorrent 客户端
@@ -189,8 +195,8 @@ Name[ms_MY]=qBittorrent
 Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
 GenericName[eo]=BitTorrent-kliento
 Name[eo]=qBittorrent
-Comment[mn_MN]=BitTorrent ашиглан файлуудыг татаж түгээх
-GenericName[mn_MN]=BitTorrent үйлчлүүлэгч
+Comment[mn_MN]=BitTorrent-оор файлуудаа тат, түгээ
+GenericName[mn_MN]=BitTorrent татагч
 Name[mn_MN]=qBittorrent
 Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
 GenericName[ta]=BitTorrent வாடிக்கையாளர்

dist/windows/options.nsi

@@ -28,7 +28,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.3.2"
+!define PROG_VERSION "4.3.3"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
@@ -51,7 +51,7 @@ XPStyle on
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2020 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2021 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

m4/qbittorrent.m4

@@ -37,15 +37,15 @@ AC_DEFUN([FIND_QTDBUS],
                          HAVE_QTDBUS=[false]])
 ])
 
-# DETECT_CPP14_PROGRAM()
-# Detects if at least C++14 mode is enabled.
+# DETECT_CPP17_PROGRAM()
+# Detects if at least C++17 mode is enabled.
 # --------------------------------------
-AC_DEFUN([DETECT_CPP14_PROGRAM],
+AC_DEFUN([DETECT_CPP17_PROGRAM],
        [AC_LANG_PROGRAM([[
             #ifndef __cplusplus
             #error "This is not a C++ compiler"
-            #elif __cplusplus < 201402L
-            #error "This is not a C++14 compiler"
+            #elif __cplusplus < 201703L
+            #error "This is not a C++17 compiler"
             #endif]],
             [[]])
 ])

macxconf.pri

@@ -7,6 +7,8 @@ else {
     include(conf.pri)
 }
 
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+
 LIBS += -framework Carbon -framework IOKit -framework AppKit
 
 QT_LANG_PATH = ../dist/qt-translations

qbittorrent.pro

@@ -4,19 +4,6 @@ SUBDIRS += src
 
 include(version.pri)
 
-# Make target to create release tarball. Use 'make tarball'
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
-tarball.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
-tarball.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-tarball.commands += cd .. &&
-tarball.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
-tarball.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
-
-QMAKE_EXTRA_TARGETS += tarball
-
 # For Qt Creator beautifier
 DISTFILES += \
     uncrustify.cfg

src/app/CMakeLists.txt

@@ -61,7 +61,6 @@ target_sources(qbt_app PRIVATE
 
 target_link_libraries(qbt_app PRIVATE
     qbt_base
-    qbt_version_definitions
 )
 
 set_target_properties(qbt_app PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")

src/app/application.cpp

@@ -63,7 +63,7 @@
 
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/session.h"
-#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrent.h"
 #include "base/exceptions.h"
 #include "base/iconprovider.h"
 #include "base/logger.h"
@@ -81,6 +81,7 @@
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
+#include "base/version.h"
 #include "applicationinstancemanager.h"
 #include "filelogger.h"
 
@@ -214,7 +215,7 @@ const QBtCommandLineParameters &Application::commandLineArgs() const
 
 bool Application::isFileLoggerEnabled() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true);
 }
 
 void Application::setFileLoggerEnabled(const bool value)
@@ -228,8 +229,8 @@ void Application::setFileLoggerEnabled(const bool value)
 
 QString Application::fileLoggerPath() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_PATH,
-            {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER}).toString();
+    return settings()->loadValue(KEY_FILELOGGER_PATH
+        , QString {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER});
 }
 
 void Application::setFileLoggerPath(const QString &path)
@@ -241,7 +242,7 @@ void Application::setFileLoggerPath(const QString &path)
 
 bool Application::isFileLoggerBackup() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true);
 }
 
 void Application::setFileLoggerBackup(const bool value)
@@ -253,7 +254,7 @@ void Application::setFileLoggerBackup(const bool value)
 
 bool Application::isFileLoggerDeleteOld() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true);
 }
 
 void Application::setFileLoggerDeleteOld(const bool value)
@@ -265,7 +266,7 @@ void Application::setFileLoggerDeleteOld(const bool value)
 
 int Application::fileLoggerMaxSize() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE);
     return std::min(std::max(val, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
 }
 
@@ -279,7 +280,7 @@ void Application::setFileLoggerMaxSize(const int bytes)
 
 int Application::fileLoggerAge() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1);
     return std::min(std::max(val, 1), 365);
 }
 
@@ -290,7 +291,7 @@ void Application::setFileLoggerAge(const int value)
 
 int Application::fileLoggerAgeType() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1);
     return ((val < 0) || (val > 2)) ? 1 : val;
 }
 
@@ -310,7 +311,7 @@ void Application::processMessage(const QString &message)
         m_paramsQueue.append(params);
 }
 
-void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) const
+void Application::runExternalProgram(const BitTorrent::Torrent *torrent) const
 {
     QString program = Preferences::instance()->getAutoRunProgram().trimmed();
     program.replace("%N", torrent->name());
@@ -404,7 +405,7 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
 #endif
 }
 
-void Application::sendNotificationEmail(const BitTorrent::TorrentHandle *torrent)
+void Application::sendNotificationEmail(const BitTorrent::Torrent *torrent)
 {
     // Prepare mail content
     const QString content = tr("Torrent name: %1").arg(torrent->name()) + '\n'
@@ -423,7 +424,7 @@ void Application::sendNotificationEmail(const BitTorrent::TorrentHandle *torrent
                      content);
 }
 
-void Application::torrentFinished(BitTorrent::TorrentHandle *const torrent)
+void Application::torrentFinished(BitTorrent::Torrent *const torrent)
 {
     Preferences *const pref = Preferences::instance();
 
@@ -505,7 +506,7 @@ void Application::processParams(const QStringList &params)
     }
 #endif
     BitTorrent::AddTorrentParams torrentParams;
-    TriStateBool skipTorrentDialog;
+    std::optional<bool> skipTorrentDialog;
 
     for (QString param : params)
     {
@@ -521,7 +522,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@addPaused=")))
         {
-            torrentParams.addPaused = param.midRef(11).toInt() ? TriStateBool::True : TriStateBool::False;
+            torrentParams.addPaused = (param.midRef(11).toInt() != 0);
             continue;
         }
 
@@ -551,7 +552,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@skipDialog=")))
         {
-            skipTorrentDialog = param.midRef(12).toInt() ? TriStateBool::True : TriStateBool::False;
+            skipTorrentDialog = (param.midRef(12).toInt() != 0);
             continue;
         }
 
@@ -561,9 +562,7 @@ void Application::processParams(const QStringList &params)
         // be shown and skipTorrentDialog is undefined. The other is when
         // skipTorrentDialog is false, meaning that the application setting
         // should be overridden.
-        const bool showDialogForThisTorrent =
-            ((AddNewTorrentDialog::isEnabled() && skipTorrentDialog == TriStateBool::Undefined)
-             || skipTorrentDialog == TriStateBool::False);
+        const bool showDialogForThisTorrent = !skipTorrentDialog.value_or(!AddNewTorrentDialog::isEnabled());
         if (showDialogForThisTorrent)
             AddNewTorrentDialog::show(param, torrentParams, m_window);
         else

src/app/application.h

@@ -59,7 +59,7 @@ class FileLogger;
 
 namespace BitTorrent
 {
-    class TorrentHandle;
+    class Torrent;
 }
 
 namespace RSS
@@ -112,7 +112,7 @@ protected:
 
 private slots:
     void processMessage(const QString &message);
-    void torrentFinished(BitTorrent::TorrentHandle *const torrent);
+    void torrentFinished(BitTorrent::Torrent *const torrent);
     void allTorrentsFinished();
     void cleanup();
 #if (!defined(DISABLE_GUI) && defined(Q_OS_WIN))
@@ -142,6 +142,6 @@ private:
 
     void initializeTranslation();
     void processParams(const QStringList &params);
-    void runExternalProgram(const BitTorrent::TorrentHandle *torrent) const;
-    void sendNotificationEmail(const BitTorrent::TorrentHandle *torrent);
+    void runExternalProgram(const BitTorrent::Torrent *torrent) const;
+    void sendNotificationEmail(const BitTorrent::Torrent *torrent);
 };

src/app/cmdoptions.cpp

@@ -254,13 +254,13 @@ namespace
             return padUsageText(fullParameter() + QLatin1String("=<true|false>"));
         }
 
-        TriStateBool value(const QString &arg) const
+        std::optional<bool> value(const QString &arg) const
         {
             QStringList parts = arg.split(QLatin1Char('='));
 
             if (parts.size() == 1)
             {
-                return TriStateBool(m_defaultValue);
+                return m_defaultValue;
             }
             if (parts.size() == 2)
             {
@@ -268,11 +268,11 @@ namespace
 
                 if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1")))
                 {
-                    return TriStateBool::True;
+                    return true;
                 }
                 if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0")))
                 {
-                    return TriStateBool::False;
+                    return false;
                 }
             }
 
@@ -282,30 +282,30 @@ namespace
                                             .arg(fullParameter(), QLatin1String("<true|false>")));
         }
 
-        TriStateBool value(const QProcessEnvironment &env) const
+        std::optional<bool> value(const QProcessEnvironment &env) const
         {
             const QString val = env.value(envVarName(), "-1");
 
             if (val.isEmpty())
             {
-                return TriStateBool(m_defaultValue);
+                return m_defaultValue;
             }
             if (val == QLatin1String("-1"))
             {
-                return TriStateBool::Undefined;
+                return std::nullopt;
             }
             if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1")))
             {
-                return TriStateBool::True;
+                return true;
             }
             if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0")))
             {
-                return TriStateBool::False;
+                return false;
             }
 
             qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
                 .arg(QLatin1String("true|false"), envVarName(), val);
-            return TriStateBool::Undefined;
+            return std::nullopt;
         }
 
         bool m_defaultValue;
@@ -374,14 +374,8 @@ QStringList QBtCommandLineParameters::paramList() const
     if (!savePath.isEmpty())
         result.append(QLatin1String("@savePath=") + savePath);
 
-    if (addPaused == TriStateBool::True)
-    {
-        result.append(QLatin1String("@addPaused=1"));
-    }
-    else if (addPaused == TriStateBool::False)
-    {
-        result.append(QLatin1String("@addPaused=0"));
-    }
+    if (addPaused.has_value())
+        result.append(*addPaused ? QLatin1String {"@addPaused=1"} : QLatin1String {"@addPaused=0"});
 
     if (skipChecking)
         result.append(QLatin1String("@skipChecking"));
@@ -395,14 +389,8 @@ QStringList QBtCommandLineParameters::paramList() const
     if (firstLastPiecePriority)
         result.append(QLatin1String("@firstLastPiecePriority"));
 
-    if (skipDialog == TriStateBool::True)
-    {
-        result.append(QLatin1String("@skipDialog=1"));
-    }
-    else if (skipDialog == TriStateBool::False)
-    {
-        result.append(QLatin1String("@skipDialog=0"));
-    }
+    if (skipDialog.has_value())
+        result.append(*skipDialog ? QLatin1String {"@skipDialog=1"} : QLatin1String {"@skipDialog=0"});
 
     result += torrents;
     return result;

src/app/cmdoptions.h

@@ -30,13 +30,12 @@
 
 #pragma once
 
+#include <optional>
 #include <stdexcept>
 
 #include <QString>
 #include <QStringList>
 
-#include "base/tristatebool.h"
-
 class QProcessEnvironment;
 
 struct QBtCommandLineParameters
@@ -55,8 +54,8 @@ struct QBtCommandLineParameters
     bool shouldDaemonize;
 #endif
     int webUiPort;
-    TriStateBool addPaused;
-    TriStateBool skipDialog;
+    std::optional<bool> addPaused;
+    std::optional<bool> skipDialog;
     QStringList torrents;
     QString profileDir;
     QString configurationName;

src/app/main.cpp

@@ -78,6 +78,7 @@ Q_IMPORT_PLUGIN(QICOPlugin)
 
 #include "base/preferences.h"
 #include "base/profile.h"
+#include "base/version.h"
 #include "application.h"
 #include "cmdoptions.h"
 #include "upgrade.h"

src/app/qtlocalpeer/qtlocalpeer.cpp

@@ -152,7 +152,7 @@ bool QtLocalPeer::isClient()
 #endif
     if (!res)
         qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
-    QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
+    connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
     return false;
 }
 

src/app/stacktracedialog.cpp

@@ -32,6 +32,7 @@
 #include <QString>
 
 #include "base/utils/misc.h"
+#include "base/version.h"
 #include "ui_stacktracedialog.h"
 
 StacktraceDialog::StacktraceDialog(QWidget *parent)

src/app/upgrade.cpp

@@ -46,8 +46,8 @@ namespace
         const auto migrate = [](const QString &oldKey, const QString &newKey, const QString &savePath)
         {
             SettingsStorage *settingsStorage {SettingsStorage::instance()};
-            const QByteArray oldData {settingsStorage->loadValue(oldKey).toByteArray()};
-            const QString newData {settingsStorage->loadValue(newKey).toString()};
+            const auto oldData {settingsStorage->loadValue<QByteArray>(oldKey)};
+            const auto newData {settingsStorage->loadValue<QString>(newKey)};
             const QString errorMsgFormat {QObject::tr("Migrate preferences failed: WebUI https, file: \"%1\", error: \"%2\"")};
 
             if (!newData.isEmpty() || oldData.isEmpty())
@@ -89,8 +89,8 @@ namespace
         const QString newKey {QLatin1String {"BitTorrent/Session/TorrentContentLayout"}};
 
         SettingsStorage *settingsStorage {SettingsStorage::instance()};
-        const QVariant oldData {settingsStorage->loadValue(oldKey)};
-        const QString newData {settingsStorage->loadValue(newKey).toString()};
+        const auto oldData {settingsStorage->loadValue<QVariant>(oldKey)};
+        const auto newData {settingsStorage->loadValue<QString>(newKey)};
 
         if (!newData.isEmpty() || !oldData.isValid())
             return;
@@ -128,7 +128,7 @@ void handleChangedDefaults(const DefaultPreferencesMode mode)
     SettingsStorage *settingsStorage {SettingsStorage::instance()};
     for (auto it = changedDefaults.cbegin(); it != changedDefaults.cend(); ++it)
     {
-        if (settingsStorage->loadValue(it->name).isNull())
+        if (settingsStorage->loadValue<QVariant>(it->name).isNull())
             settingsStorage->storeValue(it->name, (mode == DefaultPreferencesMode::Legacy ? it->legacy : it->current));
     }
 }

src/base/CMakeLists.txt

@@ -2,6 +2,7 @@ add_library(qbt_base STATIC
     # headers
     algorithm.h
     asyncfilestorage.h
+    bittorrent/abstractfilestorage.h
     bittorrent/addtorrentparams.h
     bittorrent/bandwidthscheduler.h
     bittorrent/cachestatus.h
@@ -24,10 +25,10 @@ add_library(qbt_base STATIC
     bittorrent/sessionstatus.h
     bittorrent/speedmonitor.h
     bittorrent/statistics.h
+    bittorrent/torrent.h
     bittorrent/torrentcontentlayout.h
     bittorrent/torrentcreatorthread.h
-    bittorrent/torrenthandle.h
-    bittorrent/torrenthandleimpl.h
+    bittorrent/torrentimpl.h
     bittorrent/torrentinfo.h
     bittorrent/tracker.h
     bittorrent/trackerentry.h
@@ -72,7 +73,6 @@ add_library(qbt_base STATIC
     settingsstorage.h
     torrentfileguard.h
     torrentfilter.h
-    tristatebool.h
     types.h
     unicodestrings.h
     utils/bytearray.h
@@ -86,9 +86,11 @@ add_library(qbt_base STATIC
     utils/random.h
     utils/string.h
     utils/version.h
+    version.h
 
     # sources
     asyncfilestorage.cpp
+    bittorrent/abstractfilestorage.cpp
     bittorrent/bandwidthscheduler.cpp
     bittorrent/customstorage.cpp
     bittorrent/downloadpriority.cpp
@@ -105,9 +107,9 @@ add_library(qbt_base STATIC
     bittorrent/session.cpp
     bittorrent/speedmonitor.cpp
     bittorrent/statistics.cpp
+    bittorrent/torrent.cpp
     bittorrent/torrentcreatorthread.cpp
-    bittorrent/torrenthandle.cpp
-    bittorrent/torrenthandleimpl.cpp
+    bittorrent/torrentimpl.cpp
     bittorrent/torrentinfo.cpp
     bittorrent/tracker.cpp
     bittorrent/trackerentry.cpp
@@ -148,7 +150,6 @@ add_library(qbt_base STATIC
     settingsstorage.cpp
     torrentfileguard.cpp
     torrentfilter.cpp
-    tristatebool.cpp
     utils/bytearray.cpp
     utils/foreignapps.cpp
     utils/fs.cpp
@@ -165,7 +166,6 @@ target_link_libraries(qbt_base
     PRIVATE
         OpenSSL::Crypto OpenSSL::SSL
         ZLIB::ZLIB
-        qbt_version_definitions
     PUBLIC
         LibtorrentRasterbar::torrent-rasterbar
         Qt5::Core Qt5::Network Qt5::Xml

src/base/algorithm.h

@@ -32,9 +32,6 @@
 
 namespace Algorithm
 {
-    template <typename ...>
-    using void_t = void;  // replace this with std::void_t in C++17
-
     template <typename T, typename = void>
     struct HasMappedType
         : std::false_type
@@ -42,7 +39,7 @@ namespace Algorithm
     };
 
     template <typename T>
-    struct HasMappedType<T, void_t<typename T::mapped_type>>
+    struct HasMappedType<T, std::void_t<typename T::mapped_type>>
         : std::true_type
     {
     };

src/base/base.pri

@@ -1,6 +1,7 @@
 HEADERS += \
     $$PWD/algorithm.h \
     $$PWD/asyncfilestorage.h \
+    $$PWD/bittorrent/abstractfilestorage.h \
     $$PWD/bittorrent/addtorrentparams.h \
     $$PWD/bittorrent/bandwidthscheduler.h \
     $$PWD/bittorrent/cachestatus.h \
@@ -23,10 +24,10 @@ HEADERS += \
     $$PWD/bittorrent/sessionstatus.h \
     $$PWD/bittorrent/speedmonitor.h \
     $$PWD/bittorrent/statistics.h \
+    $$PWD/bittorrent/torrent.h \
     $$PWD/bittorrent/torrentcontentlayout.h \
     $$PWD/bittorrent/torrentcreatorthread.h \
-    $$PWD/bittorrent/torrenthandle.h \
-    $$PWD/bittorrent/torrenthandleimpl.h \
+    $$PWD/bittorrent/torrentimpl.h \
     $$PWD/bittorrent/torrentinfo.h \
     $$PWD/bittorrent/tracker.h \
     $$PWD/bittorrent/trackerentry.h \
@@ -72,7 +73,6 @@ HEADERS += \
     $$PWD/settingvalue.h \
     $$PWD/torrentfileguard.h \
     $$PWD/torrentfilter.h \
-    $$PWD/tristatebool.h \
     $$PWD/types.h \
     $$PWD/unicodestrings.h \
     $$PWD/utils/bytearray.h \
@@ -85,10 +85,12 @@ HEADERS += \
     $$PWD/utils/password.h \
     $$PWD/utils/random.h \
     $$PWD/utils/string.h \
-    $$PWD/utils/version.h
+    $$PWD/utils/version.h \
+    $$PWD/version.h
 
 SOURCES += \
     $$PWD/asyncfilestorage.cpp \
+    $$PWD/bittorrent/abstractfilestorage.cpp \
     $$PWD/bittorrent/bandwidthscheduler.cpp \
     $$PWD/bittorrent/customstorage.cpp \
     $$PWD/bittorrent/downloadpriority.cpp \
@@ -105,9 +107,9 @@ SOURCES += \
     $$PWD/bittorrent/session.cpp \
     $$PWD/bittorrent/speedmonitor.cpp \
     $$PWD/bittorrent/statistics.cpp \
+    $$PWD/bittorrent/torrent.cpp \
     $$PWD/bittorrent/torrentcreatorthread.cpp \
-    $$PWD/bittorrent/torrenthandle.cpp \
-    $$PWD/bittorrent/torrenthandleimpl.cpp \
+    $$PWD/bittorrent/torrentimpl.cpp \
     $$PWD/bittorrent/torrentinfo.cpp \
     $$PWD/bittorrent/tracker.cpp \
     $$PWD/bittorrent/trackerentry.cpp \
@@ -148,7 +150,6 @@ SOURCES += \
     $$PWD/settingsstorage.cpp \
     $$PWD/torrentfileguard.cpp \
     $$PWD/torrentfilter.cpp \
-    $$PWD/tristatebool.cpp \
     $$PWD/utils/bytearray.cpp \
     $$PWD/utils/foreignapps.cpp \
     $$PWD/utils/fs.cpp \

src/base/bittorrent/abstractfilestorage.cpp

@@ -0,0 +1,140 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2020  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include "abstractfilestorage.h"
+
+#include <QDir>
+#include <QHash>
+#include <QVector>
+
+#include "base/bittorrent/common.h"
+#include "base/exceptions.h"
+#include "base/utils/fs.h"
+
+#if defined(Q_OS_WIN)
+const Qt::CaseSensitivity CASE_SENSITIVITY {Qt::CaseInsensitive};
+#else
+const Qt::CaseSensitivity CASE_SENSITIVITY {Qt::CaseSensitive};
+#endif
+
+namespace
+{
+    bool areSameFileNames(QString first, QString second)
+    {
+        if (first.endsWith(QB_EXT, Qt::CaseInsensitive))
+            first.chop(QB_EXT.size());
+        if (second.endsWith(QB_EXT, Qt::CaseInsensitive))
+            second.chop(QB_EXT.size());
+        return QString::compare(first, second, CASE_SENSITIVITY) == 0;
+    }
+}
+
+void BitTorrent::AbstractFileStorage::renameFile(const QString &oldPath, const QString &newPath)
+{
+    if (!Utils::Fs::isValidFileSystemName(oldPath, true))
+        throw RuntimeError {tr("The old path is invalid: '%1'.").arg(oldPath)};
+    if (!Utils::Fs::isValidFileSystemName(newPath, true))
+        throw RuntimeError {tr("The new path is invalid: '%1'.").arg(newPath)};
+
+    const QString oldFilePath = Utils::Fs::toUniformPath(oldPath);
+    if (oldFilePath.endsWith(QLatin1Char {'/'}))
+        throw RuntimeError {tr("Invalid file path: '%1'.").arg(oldFilePath)};
+
+    const QString newFilePath = Utils::Fs::toUniformPath(newPath);
+    if (newFilePath.endsWith(QLatin1Char {'/'}))
+        throw RuntimeError {tr("Invalid file path: '%1'.").arg(newFilePath)};
+    if (QDir().isAbsolutePath(newFilePath))
+        throw RuntimeError {tr("Absolute path isn't allowed: '%1'.").arg(newFilePath)};
+
+    int renamingFileIndex = -1;
+    for (int i = 0; i < filesCount(); ++i)
+    {
+        const QString path = filePath(i);
+
+        if ((renamingFileIndex < 0) && areSameFileNames(path, oldFilePath))
+            renamingFileIndex = i;
+
+        if (areSameFileNames(path, newFilePath))
+            throw RuntimeError {tr("The file already exists: '%1'.").arg(newFilePath)};
+    }
+
+    if (renamingFileIndex < 0)
+        throw RuntimeError {tr("No such file: '%1'.").arg(oldFilePath)};
+
+    const auto extAdjusted = [](const QString &path, const bool needExt) -> QString
+    {
+        if (path.endsWith(QB_EXT, Qt::CaseInsensitive) == needExt)
+            return path;
+
+        return (needExt ? (path + QB_EXT) : (path.left(path.size() - QB_EXT.size())));
+    };
+
+    renameFile(renamingFileIndex, extAdjusted(newFilePath, filePath(renamingFileIndex).endsWith(QB_EXT, Qt::CaseInsensitive)));
+}
+
+void BitTorrent::AbstractFileStorage::renameFolder(const QString &oldPath, const QString &newPath)
+{
+    if (!Utils::Fs::isValidFileSystemName(oldPath, true))
+        throw RuntimeError {tr("The old path is invalid: '%1'.").arg(oldPath)};
+    if (!Utils::Fs::isValidFileSystemName(newPath, true))
+        throw RuntimeError {tr("The new path is invalid: '%1'.").arg(newPath)};
+
+    const auto cleanFolderPath = [](const QString &path) -> QString
+    {
+        const QString uniformPath = Utils::Fs::toUniformPath(path);
+        return (uniformPath.endsWith(QLatin1Char {'/'}) ? uniformPath : uniformPath + QLatin1Char {'/'});
+    };
+
+    const QString oldFolderPath = cleanFolderPath(oldPath);
+    const QString newFolderPath = cleanFolderPath(newPath);
+    if (QDir().isAbsolutePath(newFolderPath))
+        throw RuntimeError {tr("Absolute path isn't allowed: '%1'.").arg(newFolderPath)};
+
+    QVector<int> renamingFileIndexes;
+    renamingFileIndexes.reserve(filesCount());
+
+    for (int i = 0; i < filesCount(); ++i)
+    {
+        const QString path = filePath(i);
+
+        if (path.startsWith(oldFolderPath, CASE_SENSITIVITY))
+            renamingFileIndexes.append(i);
+
+        if (path.startsWith(newFolderPath, CASE_SENSITIVITY))
+            throw RuntimeError {tr("The folder already exists: '%1'.").arg(newFolderPath)};
+    }
+
+    if (renamingFileIndexes.isEmpty())
+        throw RuntimeError {tr("No such folder: '%1'.").arg(oldFolderPath)};
+
+    for (const int index : renamingFileIndexes)
+    {
+        const QString newFilePath = newFolderPath + filePath(index).mid(oldFolderPath.size());
+        renameFile(index, newFilePath);
+    }
+}

src/base/bittorrent/abstractfilestorage.h

@@ -1,7 +1,7 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2011  Christian Kandeler
- * Copyright (C) 2011  Christophe Dumez <chris@qbittorrent.org>
+ * Copyright (C) 2020  Vladimir Golovnev <glassez@yandex.ru>
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
@@ -28,35 +28,26 @@
 
 #pragma once
 
-#include <QDialog>
+#include <QtGlobal>
+#include <QCoreApplication>
 
-namespace Ui
+class QString;
+
+namespace BitTorrent
 {
-    class UpDownRatioDialog;
+    class AbstractFileStorage
+    {
+        Q_DECLARE_TR_FUNCTIONS(AbstractFileStorage)
+
+    public:
+        virtual int filesCount() const = 0;
+        virtual QString filePath(int index) const = 0;
+        virtual QString fileName(int index) const = 0;
+        virtual qlonglong fileSize(int index) const = 0;
+
+        virtual void renameFile(int index, const QString &name) = 0;
+
+        void renameFile(const QString &oldPath, const QString &newPath);
+        void renameFolder(const QString &oldPath, const QString &newPath);
+    };
 }
-
-class UpDownRatioDialog final : public QDialog
-{
-    Q_OBJECT
-
-public:
-    UpDownRatioDialog(bool useDefault, qreal initialValue, qreal maxValue,
-            int initialTimeValue, int maxTimeValue,
-            QWidget *parent = nullptr);
-    ~UpDownRatioDialog();
-
-    bool useDefault() const;
-    qreal ratio() const;
-    int seedingTime() const;
-
-public slots:
-    void accept() override;
-
-private slots:
-    void handleRatioTypeChanged();
-    void enableRatioSpin();
-    void enableTimeSpin();
-
-private:
-    Ui::UpDownRatioDialog *m_ui;
-};

src/base/bittorrent/addtorrentparams.h

@@ -28,14 +28,13 @@
 
 #pragma once
 
-#include <boost/optional.hpp>
+#include <optional>
 
 #include <QSet>
 #include <QString>
 #include <QVector>
 
-#include "base/tristatebool.h"
-#include "torrenthandle.h"
+#include "torrent.h"
 #include "torrentcontentlayout.h"
 
 namespace BitTorrent
@@ -51,15 +50,15 @@ namespace BitTorrent
         bool disableTempPath = false; // e.g. for imported torrents
         bool sequential = false;
         bool firstLastPiecePriority = false;
-        TriStateBool addForced;
-        TriStateBool addPaused;
+        bool addForced = false;
+        std::optional<bool> addPaused;
         QVector<DownloadPriority> filePriorities; // used if TorrentInfo is set
         bool skipChecking = false;
-        boost::optional<BitTorrent::TorrentContentLayout> contentLayout;
-        TriStateBool useAutoTMM;
+        std::optional<BitTorrent::TorrentContentLayout> contentLayout;
+        std::optional<bool> useAutoTMM;
         int uploadLimit = -1;
         int downloadLimit = -1;
-        int seedingTimeLimit = TorrentHandle::USE_GLOBAL_SEEDING_TIME;
-        qreal ratioLimit = TorrentHandle::USE_GLOBAL_RATIO;
+        int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
+        qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
     };
 }