Bump to 4.4.1

QShareDataPointer causes a crash upon start on 32bit Qt5 Windows.
This is a temporary fix in order to release v4.4.1.

.appveyor.yml

@@ -3,7 +3,7 @@ version: '{branch}-{build}'
 # Do not build on tags (GitHub only)
 skip_tags: true
 
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 branches:
   except:  # blacklist
@@ -13,8 +13,8 @@ environment:
   REPO_DIR: &REPO_DIR c:\qbittorrent
   CACHE_DIR: &CACHE_DIR c:\qbt_cache
 
-  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version_64
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries_64.7z
 
 # project directory
 clone_folder: *REPO_DIR
@@ -38,12 +38,12 @@ install:
       appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
       COPY "c:\version_new" "%CACHE_DIR%\version")
   # Qt stay compressed in cache
-  - 7z x "%CACHE_DIR%\qt5_32.7z" -o"c:\qbt" > nul
+  - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
-  - SET PATH=%PATH%;c:\qbt\qt5_32\bin;%CACHE_DIR%\jom;
+  - CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
@@ -56,4 +56,38 @@ build_script:
   - qmake qbittorrent.pro && cd src && qmake src.pro
   - jom -j2 -f Makefile.Release
 
+after_build:
+  - cd "%REPO_DIR%"
+  - MKDIR upload
+  - COPY dist\windows\qt.conf upload
+  - COPY src\release\qbittorrent.exe upload
+  - COPY src\release\qbittorrent.pdb upload
+  - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\lib\torrent-rasterbar.dll" upload
+  - COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Network.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Sql.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Svg.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Widgets.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5WinExtras.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Xml.dll upload
+  - MKDIR upload\plugins\iconengines
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\iconengines\qsvgicon.dll upload\plugins\iconengines
+  - MKDIR upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qico.dll upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qsvg.dll upload\plugins\imageformats
+  - MKDIR upload\plugins\platforms
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll upload\plugins\platforms
+  - MKDIR upload\plugins\sqldrivers
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\sqldrivers\qsqlite.dll upload\plugins\sqldrivers
+  - MKDIR upload\plugins\styles
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll upload\plugins\styles
+
 test: off
+
+artifacts:
+  - path: upload
+    name: qBittorrent-Appveyor_Windows-x64

.github/ISSUE_TEMPLATE.md

@@ -1,19 +0,0 @@
-**Please provide the following information**
-
-### qBittorrent version and Operating System
-(type here)
-
-### If on linux, libtorrent-rasterbar and Qt version
-(type here)
-
-### What is the problem
-(type here)
-
-### What is the expected behavior
-(type here)
-
-### Steps to reproduce
-(type here)
-
-### Extra info(if any)
-(type here)

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,76 @@
+name: Bug Report
+description: File a bug report to help improve qBittorrent user experience.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### ADVISORY
+        "We do not support any versions older than the current release series"
+
+        "We do not support any 3rd party/forked versions e.g. `portableapps`/`Enhanced Edition`etc."
+
+        "Please post all details in **English**."
+
+        #### Prerequisites before submitting an issue!
+        - Read the issue reporting section in the **[contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md)**, to know how to submit a good bug report with the required information.
+        - Verify that the issue is not fixed and is reproducible in the **[latest official qBittorrent version](https://www.qbittorrent.org/download.php).**
+        - (Optional, but recommended) Verify that the issue is not fixed and is reproducible in the latest CI (**[macOS](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_macos.yaml?query=branch%3Amaster+event%3Apush)** / **[Ubuntu](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_ubuntu.yaml?query=branch%3Amaster+event%3Apush)** / **[Windows](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml?query=branch%3Amaster+event%3Apush)**) builds.
+        - Check the **[frequent/common issues list](https://github.com/qbittorrent/qBittorrent/projects/2)** and perform a **[search of the issue tracker (including closed ones)](https://github.com/qbittorrent/qBittorrent/issues)** to avoid posting a duplicate.
+        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/qbittorrent/qBittorrent/discussions)**, **[forum](https://qbforums.shiki.hu/)**, or **[subreddit](https://www.reddit.com/r/qBittorrent/)**.
+        - Verify that the **[wiki](https://github.com/qbittorrent/qBittorrent/wiki)** did not contain a suitable solution either.
+        - If relevant to issue/when asked, the qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature) must be provided.
+          See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
+
+  - type: textarea
+    attributes:
+      label: qBittorrent & operating system versions
+      description: |
+        Qt and libtorrent-rasterbar versions are required when: 1. You are using linux. 2. You are not using an official build downloaded from our website.
+
+        Example of preferred formatting:
+        qBittorrent: 4.3.7 x64
+        Operating system: Windows 10 Pro 21H1/2009 x64
+        Qt: 5.15.2
+        libtorrent-rasterbar: 1.2.14
+      placeholder: |
+        qBittorrent:
+        Operating system:
+        Qt:
+        libtorrent-rasterbar:
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What is the problem?
+      description: Please add the "crash report" (if encountered) or give a clear and concise description of problem.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Please provide reliable steps to reproduce the problem.
+      placeholder: |
+        1. First step
+        2. Second step
+        3. and so on...
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add screenshots etc. (Anything that will provide more context about the problem)
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Log(s) & preferences file(s)
+      description: |
+        Add these files: qBittorrent preferences file, qBittorrent.log & watched_folders.json (if using "Watched Folders" feature).
+        See **[Where does qBittorrent save its settings?](https://github.com/qbittorrent/qBittorrent/wiki/Frequently-Asked-Questions#Where_does_qBittorrent_save_its_settings)**
+        #### Note: It's the user's responsibility to redact any sensitive information
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Wiki
+    url: "https://github.com/qbittorrent/qBittorrent/wiki/"
+    about: "Consult the wiki first (especially the FAQ), it might already contain the information you are looking for"
+
+  - name: Question
+    url: "https://github.com/qbittorrent/qBittorrent/discussions"
+    about: "Please ask questions related to usage/setup/support/non-issue development discussion in the Discussions section"
+
+  - name: Question
+    url: "http://forum.qbittorrent.org/"
+    about: "Alternatively, ask on the official forum"
+
+  - name: Question
+    url: "https://www.reddit.com/r/qBittorrent/"
+    about: "Alternatively, use the subreddit"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest a new feature or enhancement for qBittorrent.
+labels: ["Feature request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        #### ADVISORY
+
+        "Please post all details in **English**."
+
+        #### Prerequisites before submitting a feature request!
+        - Read the feature request section in the **[contributing guidelines](https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md)**, to know how to submit a good feature request with the required information.
+        - Verify that the feature being requested is not available in the **[latest official qBittorrent version](https://www.qbittorrent.org/download.php).**
+        - (Optional but recommended) Verify that the feature being requested is not available in the latest CI (**[macOS](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_macos.yaml?query=branch%3Amaster+event%3Apush)** / **[Ubuntu](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_ubuntu.yaml?query=branch%3Amaster+event%3Apush)** / **[Windows](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_windows.yaml?query=branch%3Amaster+event%3Apush)**) builds.
+        - Search the issue tracker with the **[feature request filter](https://github.com/qbittorrent/qBittorrent/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature+request%22)** for similar feature requests (including closed ones) to avoid posting a duplicate.
+        - Make sure this is not a support request or question, both of which are better suited for either the **[discussions section](https://github.com/qbittorrent/qBittorrent/discussions)**, **[forum](https://qbforums.shiki.hu/)**, or **[subreddit](https://www.reddit.com/r/qBittorrent/)**.
+        - Verify that the **[wiki](https://github.com/qbittorrent/qBittorrent/wiki)** did not contain a suitable solution either.
+
+  - type: textarea
+    attributes:
+      label: Suggestion
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Use case
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Extra info/examples/attachments
+      description: Add screenshots etc. (Anything that will give us more context about what is being requested!)
+    validations:
+      required: false

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+<!--
+MANDATORY Before submitting your work, make sure you have:
+1. Read https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md#opening-a-pull-request
+2. Delete this comment block
+-->

.github/SUPPORT.md

@@ -0,0 +1,18 @@
+# Support Resources
+
+The issue tracker is only for bug reports/feature requests related to the project itself.
+
+Please do not use the issue tracker for questions about general program usage,
+how BitTorrent (the protocol) works in general, etc.
+
+For such questions, use one of the following community support resources:
+
+* The [discussions section][discussions-url]
+
+* The official forum [official forum][forum-url]
+
+* The [qBittorrent subreddit][subreddit-url]
+
+[discussions-url]: https://github.com/qbittorrent/qBittorrent/discussions
+[forum-url]: http://forum.qbittorrent.org/
+[subreddit-url]: https://www.reddit.com/r/qBittorrent/

.github/workflows/check_translation_tag.py

@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+# A pre-commit hook for detecting problematic <translation> tags
+# Copyright (C) 2021  Mike Tzou (Chocobo1)
+#
+# 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.
+
+from typing import Optional, Sequence
+import argparse
+import re
+
+def main(argv: Optional[Sequence[str]] = None) -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('filenames', nargs='*', help='Filenames to check')
+    args = parser.parse_args(argv)
+
+    error_msg = ""
+    regex = re.compile(r"\s*</translation>")
+
+    for filename in args.filenames:
+        line_counter = 1
+        error_buffer = ""
+
+        with open(filename) as file:
+            try:
+                for line in file:
+                    if (match := regex.match(line)) is not None:
+                        error_buffer += str(f"Defect file: \"{filename}\"\n"
+                              f"Line: {line_counter}\n"
+                              f"Column span: {match.span()}\n"
+                              f"Part: \"{match.group()}\"\n\n")
+                    line_counter += 1
+
+            except UnicodeDecodeError as error:
+                # not a text file, skip
+                continue
+
+        error_msg += error_buffer
+
+    if len(error_msg) > 0:
+        print(error_msg)
+        return 1
+
+    return 0
+
+if __name__ == '__main__':
+    exit(main())

.github/workflows/ci_file_health.yaml

@@ -11,10 +11,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install tools
-        run: |
-          sudo apt update
-          sudo apt install zsh
+        uses: actions/setup-python@v2
 
       - name: Check files
-        run: |
-          ./.github/workflows/file_health.sh
+        uses: pre-commit/action@v2.0.3

.github/workflows/ci_macos.yaml

@@ -4,13 +4,17 @@ on: [pull_request, push]
 jobs:
   ci:
     name: Build
-    runs-on: macos-10.15
+    runs-on: macos-latest
 
     strategy:
-      matrix:
-        libt_version: ["v1.2.12"]
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
       fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+        qt_version: ["5.15.2", "6.2.0"]
+        exclude:
+          - libt_version: "1.2.15"
+            qt_version: "6.2.0"
 
     env:
       openssl_root: /usr/local/opt/openssl@1.1
@@ -19,55 +23,82 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ runner.os }}
-
       - name: Install dependencies
         run: |
           brew update > /dev/null
           brew install \
             cmake ninja \
-            boost openssl@1.1 qt@5 zlib
-          brew link --force \
-            qt@5
-          # workaround for cmake + Qt
-          sudo ln -s /usr/local/opt/qt@5/mkspecs /usr/local/mkspecs
-          sudo ln -s /usr/local/opt/qt@5/plugins /usr/local/plugins
+            boost openssl@1.1 zlib
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          update_packager_index: false
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: ${{ matrix.qt_version }}
 
       - name: Install libtorrent
         run: |
-          git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_CXX_STANDARD=17 \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -Ddeprecated-functions=OFF \
             -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
           cmake --build build
           sudo cmake --install build
 
-      - name: Build qBittorrent
+      - name: Build qBittorrent (Qt5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -D${{ matrix.qbt_gui }} \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
             -DVERBOSE_CONFIGURE=ON \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
+            -D${{ matrix.qbt_gui }}
           cmake --build build
 
+      - name: Build qBittorrent (Qt6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
+            -DQT6=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          mv build/qbittorrent*.app upload
+          mkdir upload/cmake
+          cp build/compile_commands.json upload/cmake
+          mkdir upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}
-          path: |
-            build/qbittorrent.app
-            build/qbittorrent-nox.app
+          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          path: upload

.github/workflows/ci_ubuntu.yaml

@@ -7,78 +7,96 @@ jobs:
     runs-on: ubuntu-20.04
 
     strategy:
-      matrix:
-        libt_version: ["v1.2.12"]
-        qbt_gui: ["GUI=ON", "GUI=OFF"]
       fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+        qt_version: ["5.15.2", "6.2.0"]
+        exclude:
+          - libt_version: "1.2.15"
+            qt_version: "6.2.0"
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Setup ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ runner.os }}
-
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install \
-            build-essential cmake git ninja-build pkg-config \
-            libssl-dev libgeoip-dev zlib1g-dev \
-            libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev
-        # sudo apt install libqt5svg5-dev qtbase5-dev qttools5-dev # the Qt version in the standard repositories is too old...
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev zlib1g-dev
+
+      - name: Setup ccache
+        uses: Chocobo1/setup-ccache-action@v1
+        with:
+          update_packager_index: false
+          ccache_options: |
+            max_size=2G
 
-      # this will be installed under /opt/qt515. CMake will still find it automatically without additional hints
-      # to speed up the process, only the required components are installed rather than the full qt515-meta-full metapackage
       - name: Install Qt
-        run: |
-          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
-          sudo apt install \
-            qt515base qt515svg qt515tools
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: ${{ matrix.qt_version }}
 
       - name: Install libtorrent
         run: |
-          git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone \
+            --branch v${{ matrix.libt_version }} \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          git submodule update --init --recursive
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -Ddeprecated-functions=OFF \
-            --graphviz=cmake-build-dir/target_graph.dot
+            -Ddeprecated-functions=OFF
           cmake --build build
           sudo cmake --install build
 
-      - name: Build qBittorrent
+      - name: Build qBittorrent (Qt5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
-          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+          lupdate -extensions c,cpp,h,hpp,ui ./
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -D${{ matrix.qbt_gui }} \
+            -DCMAKE_INSTALL_PREFIX="/usr" \
             -DVERBOSE_CONFIGURE=ON \
-            --graphviz=build/target_graph.dot
+            -D${{ matrix.qbt_gui }}
           cmake --build build
+          DESTDIR="qbittorrent" cmake --install build
 
-      - name: Install qBittorrent
-        run: sudo cmake --install build
+      - name: Build qBittorrent (Qt6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
+        run: |
+          lupdate -extensions c,cpp,h,hpp,ui ./
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DCMAKE_INSTALL_PREFIX="/usr" \
+            -DQT6=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build
+          DESTDIR="qbittorrent" cmake --install build
+
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          mkdir upload/cmake
+          cp build/compile_commands.json upload/cmake
+          mkdir upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}
-          path: |
-            build/compile_commands.json
-            build/install_manifest.txt
-            build/target_graph.dot
-            build/qbittorrent
-            build/qbittorrent-nox
-            libtorrent/cmake-build-dir/compile_commands.json
-            libtorrent/cmake-build-dir/target_graph.dot
+          name: build-info_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          path: upload

.github/workflows/ci_windows.yaml

@@ -4,12 +4,24 @@ on: [pull_request, push]
 jobs:
   ci:
     name: Build
-    runs-on: windows-2019
+    runs-on: windows-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        libt_version: ["2.0.5", "1.2.15"]
+
+    env:
+      boost_path: "${{ github.workspace }}/../boost"
+      libtorrent_path: "${{ github.workspace }}/libtorrent"
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Setup devcmd
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Install build tools
         run: |
           choco install ninja
@@ -23,9 +35,9 @@ jobs:
           doNotUpdateVcpkg: true  # the preinstalled vcpkg is updated regularly
           setupOnly: true
 
-      # tell vcpkg to only build Release variants of the dependencies
-      - name: Configure vcpkg triplet overlay
+      - name: Install dependencies from vcpkg
         run: |
+          # tell vcpkg to only build Release variants of the dependencies
           New-Item `
             -Path "${{ github.workspace }}" `
             -Name "triplets_overlay" `
@@ -36,17 +48,10 @@ jobs:
           Add-Content `
             "${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake" `
             -Value "set(VCPKG_BUILD_TYPE release)"
-
           # clear buildtrees after each package installation to reduce disk space requirements
-      - name: Install dependencies
-        run: |
           $packages = `
-            "boost-circular-buffer:x64-windows-static-release",
-            "libtorrent:x64-windows-static-release",
-            "qt5-base:x64-windows-static-release",
-            "qt5-svg:x64-windows-static-release",
-            "qt5-tools:x64-windows-static-release",
-            "qt5-winextras:x64-windows-static-release"
+            "openssl:x64-windows-static-release",
+            "zlib:x64-windows-static-release"
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
             --overlay-triplets="${{ github.workspace }}/triplets_overlay" `
             --no-dry-run
@@ -55,31 +60,95 @@ jobs:
             --clean-after-build `
             $packages
 
-      # this is necessary to correctly find and use cl.exe with the Ninja generator for now
-      - name: Setup devcmd
-        uses: ilammy/msvc-dev-cmd@v1
+      - name: Install boost
+        run: |
+          aria2c `
+            "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.7z" `
+            -d "${{ runner.temp }}" `
+            -o "boost.7z"
+          7z x "${{ runner.temp }}/boost.7z" -o"${{ github.workspace }}/.."
+          move "${{ github.workspace }}/../boost_*" "${{ env.boost_path }}"
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: "5.15.2"
+
+      - name: Install libtorrent
+        run: |
+          git clone `
+            --branch v${{ matrix.libt_version }} `
+            --depth 1 `
+            --recurse-submodules `
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake `
+            -B build `
+            -G "Ninja" `
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
+            -DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}" `
+            -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
+            -DBOOST_ROOT="${{ env.boost_path }}" `
+            -DBUILD_SHARED_LIBS=OFF `
+            -Ddeprecated-functions=OFF `
+            -Dstatic_runtime=ON `
+            -DVCPKG_TARGET_TRIPLET=x64-windows-static-release
+          cmake --build build
+          cmake --install build
 
       - name: Build qBittorrent
         run: |
+          lupdate -extensions c,cpp,h,hpp,ui .
           cmake `
             -B build `
             -G "Ninja" `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
             -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
+            -DBOOST_ROOT="${{ env.boost_path }}" `
+            -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" `
             -DMSVC_RUNTIME_DYNAMIC=OFF `
             -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `
             -DVERBOSE_CONFIGURE=ON `
             --graphviz=build/target_graph.dot
           cmake --build build
 
+      - name: Prepare build artifacts
+        run: |
+          mkdir upload
+          copy build/qbittorrent.exe upload
+          copy build/qbittorrent.pdb upload
+          copy dist/windows/qt.conf upload
+          # runtimes
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Core.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Gui.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Network.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Sql.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Svg.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Widgets.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5WinExtras.dll" upload
+          copy "${{ env.Qt5_DIR }}/bin/Qt5Xml.dll" upload
+          mkdir upload/plugins/iconengines
+          copy "${{ env.Qt5_DIR }}/plugins/iconengines/qsvgicon.dll" upload/plugins/iconengines
+          mkdir upload/plugins/imageformats
+          copy "${{ env.Qt5_DIR }}/plugins/imageformats/qico.dll" upload/plugins/imageformats
+          copy "${{ env.Qt5_DIR }}/plugins/imageformats/qsvg.dll" upload/plugins/imageformats
+          mkdir upload/plugins/platforms
+          copy "${{ env.Qt5_DIR }}/plugins/platforms/qwindows.dll" upload/plugins/platforms
+          mkdir upload/plugins/sqldrivers
+          copy "${{ env.Qt5_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers
+          mkdir upload/plugins/styles
+          copy "${{ env.Qt5_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles
+          # cmake additionals
+          mkdir upload/cmake
+          copy build/compile_commands.json upload/cmake
+          copy build/target_graph.dot upload/cmake
+          mkdir upload/cmake/libtorrent
+          copy libtorrent/build/compile_commands.json upload/cmake/libtorrent
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_Windows-x64
-          path: |
-            build/compile_commands.json
-            build/qbittorrent.exe
-            build/qbittorrent.pdb
-            build/target_graph.dot
-            dist/windows/qt.conf
+          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}
+          path: upload

.github/workflows/coverity-scan.yml

@@ -0,0 +1,74 @@
+name: Coverity Scan
+
+on:
+  schedule:
+    - cron: '0 0 1 * *' # Monthly (1st day of month at midnight)
+  workflow_dispatch: # Mainly for testing. Don't forget the Coverity usage limits.
+
+jobs:
+  coverity_scan:
+    name: Scan
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install \
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev zlib1g-dev
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v2
+        with:
+          version: "5.15.2"
+
+      - name: Install libtorrent
+        run: |
+          git clone \
+            --branch "v2.0.5" \
+            --depth 1 \
+            --recurse-submodules \
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -Ddeprecated-functions=OFF
+          cmake --build build
+          sudo cmake --install build
+
+      - name: Download Coverity Build Tool
+        run: |
+          wget \
+            -q \
+            https://scan.coverity.com/download/linux64 \
+            --post-data "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=qbittorrent%2FqBittorrent" \
+            -O coverity_tool.tgz
+          mkdir coverity_tool
+          tar xzf coverity_tool.tgz --strip 1 -C coverity_tool
+
+      - name: Build qBittorrent
+        run: |
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DGUI=ON \
+            -DVERBOSE_CONFIGURE=ON
+          export PATH="$(pwd)/coverity_tool/bin:$PATH"
+          cov-build --dir cov-int cmake --build build
+
+      - name: Submit the result to Coverity Scan
+        run: |
+          tar caf qbittorrent.xz cov-int
+          curl \
+            --form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \
+            --form email=sledgehammer999@qbittorrent.org \
+            --form file=@qbittorrent.xz \
+            --form version="$(git rev-parse --short HEAD)" \
+            --form description="master" \
+            https://scan.coverity.com/builds?project=qbittorrent%2FqBittorrent

.github/workflows/file_health.sh

@@ -1,85 +0,0 @@
-#!/usr/bin/env zsh
-
-set -o nounset
-
-# Assumption: file names don't contain `:` (for the `cut` invocation).
-# Safe to assume, as such a character in a filename would cause trouble on Windows, a platform we support
-
-# any regression turn this non-zero
-regressions=0
-
-# exclusions (these are just grep extended regular expressions to match against paths relative to the root of the repository)
-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/*'
-exclusions_trailing_newline='configure'
-exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/*'
-
-echo -e "\n*** Detect files not encoded in UTF-8 ***\n"
-
-find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
-    | grep -v -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
-    | grep -E -v -e "${exclusions_nonutf8}" \
-    | tee >(echo -e "--> Files not encoded in UTF-8: 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'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect files encoded in UTF-8 with BOM ***\n"
-
-grep --exclude-dir={.git,build} -rIl $'\xEF\xBB\xBF' | sort \
-    | grep -E -v -e "${exclusions_bom}" \
-    | tee >(echo -e "--> Files encoded in UTF-8 with BOM: 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'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect usage of CR byte ***\n"
-
-grep --exclude-dir={.git,build} -rIlU $'\x0D' | sort \
-    | tee >(echo -e "--> Usage of CR byte: 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'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect trailing whitespace in lines ***\n"
-
-grep --exclude-dir={.git,build} -rIl "[[:blank:]]$" | sort \
-    | grep -E -v -e "${exclusions_tw}" \
-    | tee >(echo -e "--> Trailing whitespace in lines: 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';
-regressions=$((regressions+$?))
-
-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'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect no trailing newline ***\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_no_lf}" \
-    | xargs -L1 -I my_input bash -c 'test "$(tail -q -c1 "my_input" | hexdump -C | grep "0a")" || echo "my_input"' \
-    | tee >(echo -e "--> No trailing newline: 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'
-regressions=$((regressions+$?))
-
-echo -e "\n*** Detect translation closing tag in new line ***\n"
-
-grep --exclude-dir={.git,build} -nri "^</translation>" | sort \
-    | cut -d ":" -f 1,2 \
-    | tee >(echo -e "--> Translation closing tag in new line: 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'
-regressions=$((regressions+$?))
-
-if [ "$regressions" -ne 0 ]; then
-    regressions=1
-    echo "\nFile health regressions found. Please fix them (or add them as exclusions)."
-else
-    echo "All OK, no file health regressions found."
-fi
-
-exit $regressions;

.github/workflows/stale_bot.yaml

@@ -0,0 +1,22 @@
+name: Stale bot
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Mark and close stale PRs
+        uses: actions/stale@v4
+        with:
+          stale-pr-message: "This PR is stale because it has been 60 days with no activity. This PR will be automatically closed within 7 days if there is no further activity."
+          close-pr-message: "This PR was closed because it has been stalled for some time with no activity."
+          days-before-stale: -1 # avoid marking issues
+          days-before-pr-stale: 60
+          days-before-close: -1 # avoid closing issues
+          days-before-pr-close: 7
+          exempt-all-pr-assignees: true  # avoid stale for all PR with assignees
+          exempt-all-pr-milestones: true # avoid stale for all PR with milestones
+          operations-per-run: 200

.pre-commit-config.yaml

@@ -0,0 +1,55 @@
+repos:
+  - repo: local
+    hooks:
+      - id: check-translation-tag
+        name: Check newline characters in <translation> tag
+        entry: .github/workflows/check_translation_tag.py
+        language: script
+        types_or:
+          - ts
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks.git
+    rev: v4.0.1
+    hooks:
+    - id: check-json
+      name: Check JSON files
+
+    - id: check-yaml
+      name: Check YAML files
+
+    - id: fix-byte-order-marker
+      name: Check file encoding (UTF-8 without BOM)
+      exclude: |
+        (?x)^(
+          src/base/unicodestrings.h
+        )$
+
+    - id: mixed-line-ending
+      name: Check line ending character (LF)
+      args: ["--fix=lf"]
+      exclude: |
+        (?x)^(
+          compile_commands.json |
+          src/webui/www/private/scripts/lib/.*
+        )$
+
+    - id: end-of-file-fixer
+      name: Check trailing newlines
+      exclude: |
+        (?x)^(
+          compile_commands.json |
+          configure |
+          src/webui/www/private/scripts/lib/.*
+        )$
+      exclude_types:
+        - svg
+        - ts
+
+    - id: trailing-whitespace
+      name: Check trailing whitespaces
+      exclude: |
+        (?x)^(
+          src/webui/www/private/scripts/lib/.*
+        )$
+      exclude_types:
+        - ts

CMakeLists.txt

@@ -12,15 +12,18 @@ project(qBittorrent
 set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 # version requirements - older versions may work, but you are on your own
 set(minBoostVersion 1.65)
-set(minQtVersion 5.11)
+set(minQt5Version 5.15.2)
+set(minQt6Version 6.2)
 set(minOpenSSLVersion 1.1.1)
-set(minLibtorrentVersion 1.2.12)
+set(minLibtorrent1Version 1.2.14)
+set(minLibtorrentVersion 2.0.4)
 set(minZlibVersion 1.2.11)
 
 # features (some are platform-specific)
 include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
 include(FeatureSummary)
 include(FeatureOptionsSetup)
+feature_option(QT6 "Use Qt6" OFF)
 feature_option(STACKTRACE "Enable stacktraces" ON)
 feature_option(GUI "Build GUI application" ON)
 feature_option(WEBUI "Enables built-in HTTP server for headless use" ON)

CONTRIBUTING.md

@@ -6,22 +6,14 @@ Read the respective section to find out more.
 ### Table Of Contents
 
 *   **[Bug reporting etiquette](#bug-reporting-etiquette)**
-
-
 *   **[Submitting an issue/bug report](#submitting-an-issuebug-report)**
     *   [What is an actual bug report?](#what-is-an-actual-bug-report)
     *   [Before submitting a bug report](#before-submitting-a-bug-report)
     *   [Steps to ensure a good bug report](#steps-to-ensure-a-good-bug-report)
-
-
 *   **[Suggesting enhancements/feature requests](#suggesting-enhancementsfeature-requests)**
     *   [Before submitting an enhancement/feature request](#before-submitting-an-enhancementfeature-request)
     *   [Steps to ensure a good enhancement/feature suggestion](#steps-to-ensure-a-good-enhancementfeature-suggestion)
-
-
 *   **[Opening a pull request](#opening-a-pull-request)**
-    *   [Must read](#must-read)
-    *   [Good to know](#good-to-know)
 
 # Bug reporting etiquette
 
@@ -194,28 +186,26 @@ Following these guidelines helps maintainers and the community understand your s
 
 # Opening a pull request
 
-### Must read
-*   Read our [**coding guidelines**][coding-guidelines-url]. There are some scripts to help you: [uncrustify script][uncrustify-script-url], [astyle script][astyle-script-url], [(related thread)][coding-guidelines-thread-url].
-*   Keep the title **short** and provide a **clear** description about what your pull request does.
-*   Provide **screenshots** for UI related changes.
-*   Keep your git commit history **clean** and **precise.** Refer to the section about "Git commit messages" in the [**coding guidelines**][coding-guidelines-url].
-*   If your commit fixes a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here][commit-message-fix-issue-example-url].
+*   Consult [coding guidelines][coding-guidelines-url] first. If you are working on translation/i18n, read ["How to translate qBittorrent"][how-to-translate-url].
+*   Keep your git commit history clean.
+    * Refer to the section about ["Git commit messages"][coding-guidelines-git-commit-message-url] in the coding guidelines.
+    * When merge conflicts arise, do `git rebase <target_branch_name>` and fix the conflicts, don't do `git pull`. Here is a good explanation: [merging-vs-rebasing][merging-vs-rebasing-url].
+*   Keep pull request title concise and provide motivation and "what it does" in the pull request description area. Make it easy to read and understand.
+*   Provide screenshots for UI related changes.
+*   If your commit addresses a reported issue (for example issue #8454), append the following text to the commit body `Closes #8454.`. Example [commit][commit-message-fix-issue-example-url].
+*   Search [pull request list][pull-request-list-url] first. Others might have already implemented your idea (or got rejected already).
 
-### Good to know
-*   **Search** pull request history! Others might have already implemented your idea and it is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
-*   When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link][merging-vs-rebasing-url].
-
-[astyle-script-url]: https://gist.github.com/Chocobo1/539cee860d1eef0acfa6
 [attachments-howto-url]: https://help.github.com/articles/file-attachments-on-issues-and-pull-requests
+[builds-url]: https://sourceforge.net/projects/qbittorrent/files/
 [coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
-[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
+[coding-guidelines-git-commit-message-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md#10-git-commit-message
 [commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
 [forum-url]: http://forum.qbittorrent.org/
 [howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
+[how-to-translate-url]: https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent
 [merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing
+[pull-request-list-url]: https://github.com/qbittorrent/qBittorrent/pulls
 [python-url]: https://www.python.org/
 [releases-url]: https://github.com/qbittorrent/qBittorrent/releases
 [search-plugins-url]: https://github.com/qbittorrent/search-plugins
-[uncrustify-script-url]: https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg
 [wiki-url]: https://github.com/qbittorrent/qBittorrent/wiki
-[builds-url]: https://sourceforge.net/projects/qbittorrent/files/

Changelog

@@ -1,3 +1,81 @@
+Tue Feb 15 2022 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.4.1
+    - FEATURE: Restore all torrent settings to the torrent's main context menu (thalieht)
+    - FEATURE: Add confirmation for enabling Auto TMM from context menu (thalieht)
+    - FEATURE: Add tooltip to Automatic Torrent Management context menu action (thalieht)
+    - FEATURE: Add Select All/None buttons in new torrent dialog (thalieht)
+    - BUGFIX: Keep "torrent info" alive while generate .torrent file (glassez)
+    - BUGFIX: Correctly handle Auto TMM in Torrent Files Watcher (glassez)
+    - BUGFIX: Correctly track the root folder name change (glassez)
+    - BUGFIX: Various fixes to the moving torrent code (glassez)
+    - BUGFIX: Update the torrent's download path field when changing category (thalieht)
+    - BUGFIX: Correctly handle received metadata (glassez)
+    - BUGFIX: Store hybrid torrents using legacy filenames (glassez)
+    - BUGFIX: Open correct directory when clicked on Browse button (glassez)
+    - BUGFIX: Fix crash when shutting down and clicing on system tray icon (Chocobo1)
+    - BUGFIX: Fix "Free space on disk" in new torrent dialog (thalieht)
+    - BUGFIX: Optimize completed files handling (Prince Gupta)
+    - BUGFIX: Migrate proxy settings (sledgehammer999)
+    - BUGFIX: Try to recover missing categories (glassez)
+    - WEBUI: WebAPI: fix wrong key used for categories (Chocobo1)
+    - WEBUI: Remove hack for outdated IE 6 browser (Chocobo1)
+    - RSS: Correctly handle XML parsing errors (glassez)
+
+Thu Jan 06 2022 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.4.0
+    - FEATURE: Support for v2 torrents along with libtorrent 2.0.x support (glassez, Chocobo1)
+    - FEATURE: Support for Qt6 (glassez)
+    - FEATURE: Expose libtorrent hashing_threads settings (Anton Bershanskiy)
+    - FEATURE: Add "Notification timeout" option (kevtechxx)
+    - FEATURE: Add `connection_speed` to advanced settings (Chocobo1)
+    - FEATURE: Announce to all trackers if IP changed (#15001) (zhuangzi926)
+    - FEATURE: Add tooltip for various columns (Chocobo1)
+    - FEATURE: Add context menu to toggle content tab columns (#15164) (AbeniMatteo)
+    - FEATURE: Add filter "Checking" to side panel (#15166) (AbeniMatteo)
+    - FEATURE: Add "Forced metadata downloading" state (#15185) (AbeniMatteo)
+    - FEATURE: Remember last viewed page in Options dialog (#15230) (Chocobo1)
+    - FEATURE: Add tooltip to listening port spinbox (Chocobo1)
+    - FEATURE: Add "Skip hash check" option for watched folders (glassez)
+    - FEATURE: Add "Show torrent options" double-click action (glassez)
+    - FEATURE: Allow setting temp folder per torrent/catergory (glassez)
+    - FEATURE: Support folder based UI Themes (Prince Gupta)
+    - BUGFIX: Save "resume data" once file priority is changed (glassez)
+    - BUGFIX: Show priority menu at top level if there is no other in Add New Torrent dialog (FozzeY)
+    - BUGFIX: Capitalize "peer flags" descriptions (Chocobo1)
+    - BUGFIX: Reorder peer flags (Chocobo1)
+    - BUGFIX: Show "last activity" value under all circumstances (Chocobo1)
+    - BUGFIX: Elide text from the right for all columns' header (smigii)
+    - BUGFIX: Fix startup with different profiles (jagannatharjun)
+    - BUGFIX: Move a few torrent context menu actions into "Torrent options" dialog (thalieht)
+    - BUGFIX: Allow deselecting radio buttons in "Torrent options" for mixed torrents (thalieht)
+    - BUGFIX: Apply file priority changes correctly (a-sum-duma, Chocobo1)
+    - BUGFIX: Use proper string for Korean language (OctopusET)
+    - BUGFIX: Disable "add peers" menu items instead of hiding it (Chocobo1)
+    - BUGFIX: Disable system tray icon menu when app is exiting (Chocobo1)
+    - BUGFIX: Show GUI lock icon after system tray icon is initialized (Chocobo1)
+    - BUGFIX: Apply selected layout to displayed torrent content in "Add New Torrent" dialog (glassez)
+    - WEBUI: Add reverse proxy source IP resolution (#15047) (HiFiPhile)
+    - WEBUI: Support navigating UI tables with arrow keys (Thomas Piccirello)
+    - WEBUI: Support expanding/collapsing UI folders with arrow keys (Thomas Piccirello)
+    - WEBUI: Support sorting UI tables via touch (#15205) (Tom Piccirello)
+    - WEBUI: Add pieces progress bar to General tab (Jesse Smick)
+    - WEBUI: Update authors page (Chocobo1)
+    - WEBUI: Set icon sizes attribute (Daniel Aleksandersen)
+    - WEBUI: Add meta application name (Daniel Aleksandersen)
+    - WEBUI: Sort WebUI language selection values (Chocobo1)
+    - WEBUI: Use correct URL scheme in user prompt when HTTPS is enabled (Chocobo1)
+    - RSS: Stick Unread row to top in RSS feed list (Prince Gupta)
+    - RSS: Correctly use fallback icons for RSS feed in GUI (jagannatharjun)
+    - SEARCH: Add context menu for tabs in search widget (#14926) (Anton)
+    - SEARCH: Add more download options to torrent search result right-click menu (a-sum-duma)
+    - WINDOWS: Add windows-clang support (#15115) (Biswapriyo Nath)
+    - WINDOWS: Update python installer URL for Windows (xavier2k6)
+    - WINDOWS: NSIS: Update Simplified Chinese translation (Losiki)
+    - LINUX: Prolong wait time for shutdown for qbittorrent-nox (Chocobo1)
+    - LINUX: Install vector program icon (Chocobo1)
+    - LINUX: Add detection for OpenBSD, Haiku in configure script (Chocobo1)
+    - MACOS: Update Mac icons for Big Sur (17jiangz1)
+    - EXPERIMENTAL: Setting to store/load fastresume/torrent files in an SQLite database (glassez)
+    - OTHER: Many internal code refactorings and bug fixing by many people
+
 Sun Oct 31 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.9
     - BUGFIX: Fix "no action" option on torrent double click (Jose M. Abuin)
     - BUGFIX: Fix broken behavior of "priority by shown file order" (Chocobo1)
@@ -217,6 +295,127 @@ Sun Oct 18 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0
     - OTHER: Support for libtorrent 1.1.x is dropped (Chocobo1)
     - OTHER: Many code cleanups and improvements (FranciscoPombal, Chocobo1, glassez)
 
+Sat Apr 25 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.5
+    - BUGFIX: Fix crash when torrent is deleted on limit reached (glassez)
+    - BUGFIX: Register datatype properly (Chocobo1)
+    - WEBUI: Add ability to send custom HTTP headers (Chocobo1)
+    - WEBUI: Expand RSS related API (Sepro)
+    - WINDOWS: Installer: Update german translation (schnurlos)
+
+Wed Apr 22 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.4
+    - BUGFIX: Fix sub-sorting of Transfer list (glassez)
+    - BUGFIX: Fix wrong logic that disables "prevent sleeping" timer (Chocobo1)
+    - BUGFIX: Set disk cache size for older libtorrent versions (NotTsunami)
+    - BUGFIX: Sort locale language list (Chocobo1)
+    - BUGFIX: Remove white outline around mascot.png (adem)
+    - BUGFIX: Various fixes in configuring the chosen network interface and not leaking the IP (Raif Atef, an0n666)
+    - BUGFIX: Save "resume data" when torrent storage is moved (glassez)
+    - BUGFIX: Avoid holding encoded resume data in memory (Chocobo1)
+    - BUGFIX: Fix date format for "Last seen complete" (Chocobo1)
+    - BUGFIX: Remove deprecated strict super seeding mode from advanced settings (an0n666)
+    - BUGFIX: Change default stop_tracker_timeout settings (an0n666)
+    - BUGFIX: Convert the Log widget to use custom View/Model (jagannatharjun)
+    - BUGFIX: Change default upload slot choking limits (an0n666)
+    - BUGFIX: Don't uncheck Authentication checkbox when changing proxy type (thalieht)
+    - BUGFIX: Reduce ambiguity for selecting tray icons (Chocobo1)
+    - WEBUI: Fix unable to add multiple peers in WebUI (Sepro)
+    - WEBUI: Fix UPnP lease duration get/set (NotTsunami)
+    - SEARCH: Detect python3 executable on Windows (József Sallai)
+
+Wed Apr 01 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.3
+    - FEATURE: Add logging for SOCKS5 proxy errors (Chocobo1)
+    - FEATURE: Add UPnP lease duration advanced option (NotTsunami)
+    - BUGFIX: Allow to translate error messages (Chocobo1)
+    - BUGFIX: Don't round scaling factor (Nick Korotysh)
+    - BUGFIX: Save log file in UTF-8 encoding (Chocobo1)
+    - BUGFIX: Avoid log file excessive flushing (Chocobo1)
+    - BUGFIX: Fix regression when fastresume contains network path (Tester798)
+    - BUGFIX: Fix broken UNC paths in fastresumes on Windows (sledgehammer999)
+    - BUGFIX: Prevent multiple instances for the same app config (glassez)
+    - BUGFIX: Fix unexpected torrent resume after app restart with libtorrent 1.1.x (glassez)
+    - WEBUI: Add alt and title tags for WebUI footer (LameLemon)
+    - WINDOWS: Installer: Update Finnish translation (Roope Jukkara)
+    - WINDOWS: Installer: Update Japanese translation (maboroshin)
+    - WINDOWS: Installer: Update Turkish translation (Burak Yavuz)
+    - WINDOWS: Installer: Update Russian translation (Andrei Stepanov)
+
+Tue Mar 24 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.2
+    - FEATURE: Allow transfer list text color changes through QSS (Prince Gupta)
+    - FEATURE: Option to show console when external program is run (sledgehammer999)
+    - FEATURE: Rename Country column to "Country / Region" (Thomas Piccirello)
+    - FEATURE: Change the defaults of some settings (FranciscoPombal)
+    - FEATURE: Refactored Transfer List code to allow theming. As a sideffect the row height has more padding. (glassez)
+    - FEATURE: Allow double-click in preview dialog (thalieht)
+    - FEATURE: Expose stop_tracker_timeout in advanced settings (an0n666)
+    - FEATURE: Add piece_extent_affinity to AdvancedSettings (FranciscoPombal)
+    - FEATURE: Reorganize UI theme selection (Prince Gupta)
+    - FEATURE: Show any multiple connections from the same IP in peer list (thalieht)
+    - FEATURE: Add stalled filters to GUI and Web API/UI (FranciscoPombal)
+    - FEATURE: Use IP geolocation database by DB-IP instead of MaxMind (sledgehammer999)
+    - FEATURE: Allow to save downloaded metadata as torrent file (glassez)
+    - FEATURE: Allow single app instance per configuration (glassez)
+    - PERFORMANCE: Move multiple torrents one by one (glassez)
+    - BUGFIX: Disable Torrent Queue by default for new users (an0n666)
+    - BUGFIX: Update free disk space label on Category change in Auto Mode (Medvedishce)
+    - BUGFIX: Save resume data after recheck (glassez)
+    - BUGFIX: Tracker is errored only if all local endpoints fail (sledgehammer999)
+    - BUGFIX: Change placement of stop tracker timeout setting (An0n)
+    - BUGFIX: Redesign torrent startup handling (glassez)
+    - BUGFIX: Show "∞" instead of " -1" in Preferences (Sakib-Abrar)
+    - BUGFIX: Improve code efficiency for reverse resolution of peers (Chocobo1)
+    - BUGFIX: Handle HTTP redirection to magnet URI (glassez)
+    - BUGFIX: Various fixes for portable mode (Tester798)
+    - BUGFIX: Include resume folder path in exception message (Chocobo1)
+    - BUGFIX: Change placeholder text in torrent list's filter (djt3)
+    - BUGFIX: Improvements in the embedded tracker to be more spec compliant (FranciscoPombal)
+    - BUGFIX: Improve the options tooltips (NotTsunami)
+    - BUGFIX: Check if file exists in seed mode (an0n666)
+    - BUGFIX: Delegate GUI scaling work to Qt (Nick Korotysh)
+    - BUGFIX: Fix crash when renaming torrent contents (Chocobo1)
+    - BUGFIX: Fix total connected peers count calculation (FranciscoPombal)
+    - BUGFIX: Allow other keypresses in LogListWidget (NotTsunami)
+    - BUGFIX: Disable Auto TMM when not using default savepath from monitored folder (thalieht)
+    - WEBUI: Fix first row renaming in files tab (Denis)
+    - WEBUI: Use SVG image for WebUI favicon (Nick Korotysh)
+    - WEBUI: Inherit text color for filter list elements (Nick Korotysh)
+    - WEBUI: Expose WebUI ban counter to users (Chocobo1)
+    - WEBUI: Expose WebUI ban duration to users (Chocobo1)
+    - WEBUI: Implement "Secure" flag for session cookie (FranciscoPombal)
+    - WEBUI: Remove unused/deprecated option (FranciscoPombal)
+    - WEBUI: Prevent excessive sync requests (FranciscoPombal)
+    - WEBUI: Fix populating statistics window (FranciscoPombal)
+    - WEBUI: Fix matching uncategorized torrents (FranciscoPombal)
+    - WEBUI: Always allow whitespace in category names (FranciscoPombal)
+    - SEARCH: Bump python version for new installation (Chocobo1)
+    - SEARCH: Fix missing string (Chocobo1)
+    - SEARCH: Drop python2 support (Chocobo1)
+    - WINDOWS: Installer: Option to start qBittorrent on Windows start up (An0n)
+    - WINDOWS: Installer: Improve Czech translation (slrslr)
+    - WINDOWS: Installer: Update French translation (zywo)
+    - WINDOWS: Installer: Update German translation (schnurlos)
+    - WINDOWS: Installer: Update Japanese translation (maboroshin)
+    - WINDOWS: Path length limitation is removed on Windows 10 1607 onwards (an0n666)
+
+Wed Dec 18 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.1
+    - FEATURE: Enable portable mode if "profile" directory exists (Tester798)
+    - FEATURE: Enable "Apply rate limit to peers on LAN" option by default (Chocobo1)
+    - BUGFIX: Sync translations from Transifex and run lupdate (sledgehammer999)
+    - BUGFIX: Don't unnecessarily delete OS files in folders (sledgehammer999)
+    - BUGFIX: Use the incomplete folder where appropriate (sledgehammer999)
+    - BUGFIX: Align Properties tab bar correctly on window resize (Prince Gupta)
+    - BUGFIX: Rework the listening IP/interface selection code (sledgehammer999)
+    - BUGFIX: Fix inconsistent icon for deleting torrent (Chocobo1)
+    - BUGFIX: Show torrent error message in transfer list (Chocobo1)
+    - BUGFIX: Fix stuck in wrong torrent state (Chocobo1)
+    - BUGFIX: Expand single-item folders in torrent content (warren)
+    - WEBUI: Bump Web API version (sledgehammer999)
+    - WEBUI: Add ability to rename torrent files from the WebUI (Thomas Piccirello)
+    - WEBUI: Mention lack of HTTPS in WebUI magnet link warning (nl6720)
+    - WEBUI: Fix HTML elements size in search tab (Chocobo1)
+    - SEARCH: Fix incorrect translation displayed after language change (Chocobo1)
+    - SEARCH: Fix missing translations in search plugins dialog (Chocobo1)
+    - WINDOWS: Update russian translation of the installer (Andrei Stepanov)
+
 Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - FEATURE: Libtorrent 1.2.x series are supported now (glassez)
     - FEATURE: Add OpenSSL version to GUI and stackdump (Chocobo1)

INSTALL

@@ -5,20 +5,22 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - Boost >= 1.65
 
-  - libtorrent-rasterbar >= 1.2.12 (by Arvid Norberg)
-      * https://www.libtorrent.org/
+  - libtorrent-rasterbar 1.2.14 - 1.2.x || 2.0.4 - 2.0.x
+      * By Arvid Norberg, https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
   - OpenSSL >= 1.1.1
 
-  - Qt >= 5.12
+  - Qt 5.15.2 - 5.x || 6.2.0 - 6.x
 
   - zlib >= 1.2.11
 
-  - pkg-config (compile-time only on *nix systems)
+  - pkg-config *
+      * Compile-time only on *nix systems
 
-  - Python >= 3.5.0 (optional, runtime only)
-      * Required by the internal search engine
+  - Python >= 3.5.0
+      * Optional, run-time only
+      * Used by the bundled search engine
 
 Dependency version numbers are bumped every once in a while to keep the range of properly tested configurations manageable, even if not strictly required to build.
 You may be able to build with older versions of (some of) the dependencies other than the minimum versions specified in the build scripts, but support for such builds is not provided - you are on your own.

README.md

@@ -46,7 +46,7 @@ Please report any bug (or feature request) to:
 http://bugs.qbittorrent.org
 
 Official IRC channel:
-`#qbittorrent on irc.libera.chat`
+[#qbittorrent on irc.libera.chat](ircs://irc.libera.chat:6697/qbittorrent)
 
 ------------------------------------------
-sledgehammer999 <sledgehammer999@qbittorrent.org>
+sledgehammer999 \<sledgehammer999@qbittorrent.org\>

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -17,7 +17,7 @@ macro(qbt_common_config)
     )
 
     target_compile_definitions(qbt_common_cfg INTERFACE
-        QT_DEPRECATED_WARNINGS
+        QT_DISABLE_DEPRECATED_BEFORE=0x050f02
         QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_USE_QSTRINGBUILDER
@@ -25,6 +25,12 @@ macro(qbt_common_config)
         $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
     )
 
+    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+        target_compile_definitions(qbt_common_cfg INTERFACE
+            _DARWIN_FEATURE_64_BIT_INODE
+        )
+    endif()
+
     if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
         target_compile_definitions(qbt_common_cfg INTERFACE
             NTDDI_VERSION=0x06010000
@@ -37,7 +43,7 @@ macro(qbt_common_config)
         )
     endif()
 
-    if ((CXX_COMPILER_ID STREQUAL "GNU") OR (CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+    if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
         target_compile_options(qbt_common_cfg INTERFACE
             -Wall
             -Wextra
@@ -59,7 +65,7 @@ macro(qbt_common_config)
         endif()
     endif()
 
-    if ((CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+    if ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
         target_compile_options(qbt_common_cfg INTERFACE
             -Wno-range-loop-analysis
         )
@@ -79,6 +85,8 @@ macro(qbt_common_config)
         target_compile_options(qbt_common_cfg INTERFACE
             /guard:cf
             /utf-8
+            # https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/
+            /Zc:__cplusplus
         )
         target_link_options(qbt_common_cfg INTERFACE
             /guard:cf
@@ -88,4 +96,7 @@ macro(qbt_common_config)
         )
     endif()
 
+    if (LibtorrentRasterbar_VERSION VERSION_GREATER_EQUAL ${minLibtorrentVersion})
+        target_compile_definitions(qbt_common_cfg INTERFACE QBT_USES_LIBTORRENT2)
+    endif()
 endmacro(qbt_common_config)

conf.pri.windows

@@ -45,6 +45,9 @@ DEFINES += BOOST_SYSTEM_STATIC_LINK
 # Enable if linking dynamically against libtorrent
 #DEFINES += TORRENT_LINKING_SHARED
 
+# Enable this if compiling with libtorrent 2.x
+#DEFINES += QBT_USES_LIBTORRENT2
+
 # Enable stack trace support
 CONFIG += stacktrace
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.3.9], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.4.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}
@@ -53,17 +53,32 @@ AC_ARG_ENABLE(qt-dbus,
               [enable_qt_dbus=yes])
 
 # Detect OS
-AC_MSG_CHECKING([whether OS is FreeBSD])
-AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
-      [AC_MSG_RESULT([yes])
-      LIBS="-lexecinfo $LIBS"],
-      [AC_MSG_RESULT([no])])
+AC_MSG_CHECKING([whether to enable specific tweaks for current host "$host_os"])
+case "$host_os" in
+    *darwin*)
+        AC_MSG_RESULT([yes])
+        enable_qt_dbus=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])])
+    *freebsd*)
+        AC_MSG_RESULT([yes])
+        LIBS="-lexecinfo $LIBS"
+        ;;
+
+    *haiku*)
+        AC_MSG_RESULT([yes])
+        LIBS="-lnetwork $LIBS"
+        ;;
+
+    *openbsd*)
+        AC_MSG_RESULT([yes])
+        LIBS="-lexecinfo $LIBS"
+        ;;
+
+    *)
+        AC_MSG_RESULT([no])
+        ;;
+esac
 
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
@@ -141,7 +156,7 @@ AS_IF([test "x$QT_QMAKE" = "x"],
       [AC_MSG_ERROR([Could not find qmake])
       ])
 AS_IF([test "x$enable_gui" = "xyes"],
-      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.11])
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.15.2])
       ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
@@ -175,14 +190,12 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
 AC_COMPILE_IFELSE([DETECT_BOOST_VERSION_PROGRAM(106000)], [],
     [QBT_ADD_DEFINES="$QBT_ADD_DEFINES BOOST_NO_CXX11_RVALUE_REFERENCES"])
 
-AX_BOOST_SYSTEM()
-AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
-LIBS="$BOOST_SYSTEM_LIB $LIBS"
-
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.2.12],
-                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
-                  LIBS="$libtorrent_LIBS $LIBS"])
+                  [libtorrent-rasterbar >= 2.0.4],
+                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],
+                  [PKG_CHECK_MODULES(libtorrent,
+                                     [libtorrent-rasterbar >= 1.2.14 libtorrent-rasterbar < 2],
+                                     [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"])])
 
 PKG_CHECK_MODULES(openssl,
                   [openssl >= 1.1.1],
@@ -216,7 +229,7 @@ AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
                          CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
                          AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
+                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++17"
                                             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++17 but the user or a dependency has explicitly enabled a lower mode.])])],

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.9</string>
+	<string>4.4.1</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2021 The qBittorrent project</string>
+	<string>Copyright © 2006-2022 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/unix/CMakeLists.txt

@@ -30,12 +30,6 @@ install(FILES ${MAN_FILES}
 )
 
 if (GUI)
-    install(DIRECTORY menuicons/
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
-        COMPONENT data
-        FILES_MATCHING PATTERN "*.png"
-    )
-
     install(FILES org.qbittorrent.qBittorrent.desktop
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
         COMPONENT data
@@ -46,6 +40,11 @@ if (GUI)
         COMPONENT data
     )
 
+    install(DIRECTORY menuicons/
+        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
+        COMPONENT data
+    )
+
     install(FILES
         ${PROJECT_SOURCE_DIR}/src/icons/qbittorrent-tray.svg
         ${PROJECT_SOURCE_DIR}/src/icons/qbittorrent-tray-dark.svg

dist/unix/menuicons/scalable/apps/qbittorrent.svg

@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024">
+  <title>
+    qbittorrent-new-light
+  </title>
+  <defs>
+    <linearGradient x1="34.012%" y1="0%" x2="76.373%" y2="76.805%" id="a">
+      <stop stop-color="#72B4F5" offset="0%"/>
+      <stop stop-color="#356EBF" offset="100%"/>
+    </linearGradient>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <circle stroke="#DAEFFF" stroke-width="32" fill="url(#a)" cx="512" cy="512" r="496"/>
+    <path d="M712.898 332.399q66.657 0 103.38 45.671 37.03 45.364 37.03 128.684t-37.34 129.61q-37.03 45.98-103.07 45.98-33.02 0-60.484-12.035-27.156-12.344-45.672-37.649h-3.703l-10.8 43.512h-36.724V196h51.227v116.65q0 39.191-2.469 70.359h2.47q35.796-50.61 106.155-50.61zm-7.406 42.894q-52.46 0-75.605 30.242-23.145 29.934-23.145 101.219t23.762 102.145q23.761 30.55 76.222 30.55 47.215 0 70.36-34.254 23.144-34.562 23.144-99.058 0-66.04-23.144-98.442-23.145-32.402-71.594-32.402z" fill="#fff"/>
+    <path d="M317.273 639.45q51.227 0 74.68-27.466 23.453-27.464 24.996-92.578v-11.418q0-70.976-24.07-102.144-24.07-31.168-76.223-31.168-45.055 0-69.125 35.18-23.762 34.87-23.762 98.75 0 63.879 23.454 97.515 23.761 33.328 70.05 33.328zm-7.715 42.894q-65.421 0-102.144-45.98-36.723-45.981-36.723-128.376 0-83.011 37.032-129.609 37.03-46.598 103.07-46.598 69.433 0 106.773 52.461h2.778l7.406-46.289h40.426V828h-51.227V683.27q0-30.86 3.395-52.461h-4.012q-35.488 51.535-106.774 51.535z" fill="#c8e8ff"/>
+  </g>
+</svg>

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.9" date="2021-10-31"/>
+    <release version="4.4.1" date="2022-02-15"/>
   </releases>
 </component>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -16,15 +16,12 @@ Keywords=bittorrent;torrent;magnet;download;p2p;
 
 
 # Translations
-Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
-GenericName[oc]=Client BitTorrent
-Name[oc]=qBittorrent
 Comment[af]=Aflaai en deel lêers oor BitTorrent
 GenericName[af]=BitTorrent kliënt
 Name[af]=qBittorrent
 Comment[ar]=نزّل وشارك الملفات عبر كيوبت‎تورنت
 GenericName[ar]=عميل بت‎تورنت
-Name[ar]=كيوبت‎تورنت
+Name[ar]=qBittorrent
 Comment[be]=Спампоўванне і раздача файлаў праз пратакол BitTorrent
 GenericName[be]=Кліент BitTorrent
 Name[be]=qBittorrent
@@ -33,7 +30,10 @@ GenericName[bg]=BitTorrent клиент
 Name[bg]=qBittorrent
 Comment[bn]=বিটটরেন্টে  ফাইল ডাউনলোড এবং শেয়ার করুন
 GenericName[bn]=বিটটরেন্ট ক্লায়েন্ট
-Name[bn]=কিউবি্টটরেন্ট
+Name[bn]=qBittorrent
+Comment[zh]=通过 BitTorrent 下载和分享文件
+GenericName[zh]=BitTorrent 客户端
+Name[zh]=qBittorrent
 Comment[bs]=Preuzmi i dijeli datoteke preko BitTorrent-a
 GenericName[bs]=BitTorrent klijent
 Name[bs]=qBittorrent
@@ -66,11 +66,11 @@ GenericName[eu]=BitTorrent bezeroa
 Name[eu]=qBittorrent
 Comment[fa]=دانلود و به اشتراک گذاری فایل های بوسیله  بیت تورنت
 GenericName[fa]=بیت تورنت نسخه کلاینت
-Name[fa]=کیو بیت تورنت
+Name[fa]=qBittorrent
 Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
 GenericName[fi]=BitTorrent-asiakasohjelma
 Name[fi]=qBittorrent
-Comment[fr]=Letölteni és megosztani a dokumentumokat Bittorrenttel
+Comment[fr]=Télécharger et partager des fichiers sur BitTorrent
 GenericName[fr]=Client BitTorrent
 Name[fr]=qBittorrent
 Comment[gl]=Descargar e compartir ficheiros co protocolo BitTorrent
@@ -78,7 +78,7 @@ GenericName[gl]=Cliente BitTorrent
 Name[gl]=qBittorrent
 Comment[gu]=બિટ્ટોરેંટ પર ફાઈલો ડાઉનલોડ અને શેર કરો
 GenericName[gu]=બિટ્ટોરેંટ ક્લાયન્ટ
-Name[gu]=ક્યૂ-બિટ્ટોરેંટ
+Name[gu]=qBittorrent
 Comment[he]=הורד ושתף קבצים על גבי ביטורנט
 GenericName[he]=לקוח ביטורנט
 Name[he]=qBittorrent
@@ -109,24 +109,18 @@ Name[ka]=qBittorrent
 Comment[ko]=BitTorrent를 통해 파일 다운로드 및 공유
 GenericName[ko]=BitTorrent 클라이언트
 Name[ko]=qBittorrent
-Comment[zh]=通过 BitTorrent 下载和分享文件
-GenericName[zh]=BitTorrent 客户端
-Name[zh]=qBittorrent
 Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
 GenericName[lt]=BitTorrent klientas
 Name[lt]=qBittorrent
 Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
 GenericName[mk]=BitTorrent клиент
 Name[mk]=qBittorrent
-Comment[en_AU]=Download and share files over BitTorrent
-GenericName[en_AU]=BitTorrent client
-Name[en_AU]=qBittorrent
+Comment[my]=တောရန့်ဖြင့်ဖိုင်များဒေါင်းလုဒ်ဆွဲရန်နှင့်မျှဝေရန်
+GenericName[my]=တောရန့်စီမံခန့်ခွဲသည့်အရာ
+Name[my]=qBittorrent
 Comment[nb]=Last ned og del filer over BitTorrent
 GenericName[nb]=BitTorrent-klient
 Name[nb]=qBittorrent
-Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘߐߕߟߊ߫ ߓߌߙߏߙߍ߲ߕ ߞߊ߲߬
-GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
-Name[nqo]=ߞߎ߳ߓߌߕߏߙߍ߲ߕ
 Comment[nl]=Bestanden downloaden en delen via BitTorrent
 GenericName[nl]=BitTorrent-client
 Name[nl]=qBittorrent
@@ -151,6 +145,7 @@ Name[sk]=qBittorrent
 Comment[sl]=Prenesite in delite datoteke preko BitTorrenta
 GenericName[sl]=BitTorrent odjemalec
 Name[sl]=qBittorrent
+Name[sq]=qBittorrent
 Comment[sr]=Преузимајте и делите фајлове преко BitTorrent протокола
 GenericName[sr]=BitTorrent-клијент
 Name[sr]=qBittorrent
@@ -160,6 +155,52 @@ Name[sr@latin]=qBittorrent
 Comment[sv]=Hämta och dela filer över BitTorrent
 GenericName[sv]=BitTorrent-klient
 Name[sv]=qBittorrent
+Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
+GenericName[ta]=BitTorrent வாடிக்கையாளர்
+Name[ta]=qBittorrent
+Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
+GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
+Name[te]=qBittorrent
+Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
+GenericName[th]=ไคลเอนต์ BitTorrent
+Name[th]=qBittorrent
+Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
+GenericName[tr]=BitTorrent istemcisi
+Name[tr]=qBittorrent
+Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
+GenericName[ur]=قیو بٹ ٹورنٹ   کلائنٹ
+Name[ur]=qBittorrent
+Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
+GenericName[uk]=BitTorrent-клієнт
+Name[uk]=qBittorrent
+Comment[vi]=Tải về và chia sẻ tệp qua BitTorrent
+GenericName[vi]=Máy khách BitTorrent
+Name[vi]=qBittorrent
+Comment[zh_HK]=經由BitTorrent下載並分享檔案
+GenericName[zh_HK]=BitTorrent用戶端
+Name[zh_HK]=qBittorrent
+Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
+GenericName[zh_TW]=BitTorrent 客戶端
+Name[zh_TW]=qBittorrent
+Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
+GenericName[eo]=BitTorrent-kliento
+Name[eo]=qBittorrent
+Comment[kk]=BitTorrent арқылы файл жүктеу және бөлісу
+GenericName[kk]=BitTorrent клиенті
+Name[kk]=qBittorrent
+Comment[en_AU]=Download and share files over BitTorrent
+GenericName[en_AU]=BitTorrent client
+Name[en_AU]=qBittorrent
+Name[rm]=qBittorrent
+Name[jv]=qBittorrent
+Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
+GenericName[oc]=Client BitTorrent
+Name[oc]=qBittorrent
+Name[ug]=qBittorrent
+Name[yi]=qBittorrent
+Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘߐߕߟߊ߫ ߓߌߙߏߙߍ߲ߕ ߞߊ߲߬
+GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
+Name[nqo]=qBittorrent
 Comment[uz@Latn]=BitTorrent orqali fayllarni yuklab olish va baham ko‘rish
 GenericName[uz@Latn]=BitTorrent mijozi
 Name[uz@Latn]=qBittorrent
@@ -168,55 +209,23 @@ GenericName[ltg]=BitTorrent klients
 Name[ltg]=qBittorrent
 Comment[hi_IN]=BitTorrent द्वारा फाइल डाउनलोड व सहभाजन
 GenericName[hi_IN]=Bittorrent साधन
-Name[hi_IN]=क्यूबिटटाॅरेंट
-Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
-GenericName[tr]=BitTorrent istemcisi
-Name[tr]=qBittorrent
-Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
-GenericName[ur]=قیو بٹ ٹورنٹ   کلائنٹ
-Name[ur]=قیو بٹ ٹورنٹ
-Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
-GenericName[uk]=BitTorrent-клієнт
-Name[uk]=qBittorrent
-Comment[vi]=Tải về và chia sẻ tệp qua BitTorrent
-GenericName[vi]=Máy khách BitTorrent
-Name[vi]=qBittorrent
+Name[hi_IN]=qBittorrent
 Comment[az@latin]=Faylları BitTorrent vasitəsilə göndərin və paylaşın
 GenericName[az@latin]=BitTorrent client
 Name[az@latin]=qBittorrent
-Comment[zh_HK]=經由BitTorrent下載並分享檔案
-GenericName[zh_HK]=BitTorrent用戶端
-Name[zh_HK]=qBittorrent
-Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
-GenericName[zh_TW]=BitTorrent 客戶端
-Name[zh_TW]=qBittorrent
 Comment[lv_LV]=Lejupielādēt un koplietot failus ar BitTorrent
 GenericName[lv_LV]=BitTorrent klients
 Name[lv_LV]=qBittorrent
-Comment[kk]=BitTorrent арқылы файл жүктеу және бөлісу
-GenericName[kk]=BitTorrent клиенті
-Name[kk]=qBittorrent
 Comment[ms_MY]=Muat turun dan kongsi fail melalui BitTorrent
 GenericName[ms_MY]=Klien BitTorrent
 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 татагч
 Name[mn_MN]=qBittorrent
-Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
-GenericName[ta]=BitTorrent வாடிக்கையாளர்
-Name[ta]=qBittorrent
 Comment[ne_NP]=फाइलहरू डाउनलोड गर्नुहोस् र BitTorrent मा साझा गर्नुहोस्
 GenericName[ne_NP]=BitTorrent क्लाइन्ट
 Name[ne_NP]=qBittorrent
-Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
-GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
-Name[te]=క్యు  బిట్ టొరెంట్
 Comment[pt_PT]=Transferir e partilhar ficheiros por BitTorrent
 GenericName[pt_PT]=Cliente BitTorrent
 Name[pt_PT]=qBittorrent
-Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
-GenericName[th]=ไคลเอนต์ BitTorrent
-Name[th]=qBittorrent
+Name[si_LK]=qBittorrent

dist/unix/systemd/qbittorrent-nox@.service.in

@@ -9,6 +9,7 @@ Type=simple
 PrivateTmp=false
 User=%i
 ExecStart=@EXPAND_BINDIR@/qbittorrent-nox
+TimeoutStopSec=1800
 
 [Install]
 WantedBy=multi-user.target

dist/windows/installer-translations/simpchinese.nsi

@@ -1,37 +1,37 @@
 ;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_SIMPCHINESE} "qBittorrent (必要)"
+LangString inst_qbt_req ${LANG_SIMPCHINESE} "qBittorrent 主程序 (必要)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
 LangString inst_dekstop ${LANG_SIMPCHINESE} "创建桌面快捷方式"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SIMPCHINESE} "创建开始菜单快捷方式"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_SIMPCHINESE} "在Windows上启动qBittorrent进行启动"
+LangString inst_startup ${LANG_SIMPCHINESE} "qBittorrent 开机自启动"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_SIMPCHINESE} "用 qBittorrent 打开.torrent文件"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
 LangString inst_magnet ${LANG_SIMPCHINESE} "用 qBittorrent 打开磁力链接"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_SIMPCHINESE} "添加Windows防火墙规则"
+LangString inst_firewall ${LANG_SIMPCHINESE} "添加 Windows 防火墙规则"
 ;LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
-LangString inst_pathlimit ${LANG_SIMPCHINESE} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_SIMPCHINESE} "解除 Windows 的 PATH 长度限制 (解除 MAX_PATH 为 260 的限制, 需要 Windows 10 1607 或更新版本)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_SIMPCHINESE} "正在添加Windows防火墙规则"
+LangString inst_firewallinfo ${LANG_SIMPCHINESE} "正在添加 Windows 防火墙规则"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_SIMPCHINESE} "qBittorrent 正在运行。 安装前请关闭应用程序。"
+LangString inst_warning ${LANG_SIMPCHINESE} "qBittorrent 正在运行。 安装前请先关闭它。"
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_SIMPCHINESE} "检测到以前的安装。 它将被卸载但不删除用户设置。"
+LangString inst_uninstall_question ${LANG_SIMPCHINESE} "当前版本会被卸载。 用户设置和种子会被完整保留。"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SIMPCHINESE} "卸载以前的版本。"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_SIMPCHINESE} "启动 qBittorrent."
+LangString launch_qbt ${LANG_SIMPCHINESE} "启动 qBittorrent。"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_SIMPCHINESE} "此安装程序只能在64位的Windows上工作。"
+LangString inst_requires_64bit ${LANG_SIMPCHINESE} "此安装程序仅支持 64 位 Windows 系统。"
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_SIMPCHINESE} "This qBittorrent version requires at least Windows 7."
+LangString inst_requires_win7 ${LANG_SIMPCHINESE} "这个版本的 qBittorrent 仅支持 Windows 7 及更新的系统。"
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
-LangString inst_uninstall_link_description ${LANG_SIMPCHINESE} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SIMPCHINESE} "卸载 qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
@@ -41,20 +41,20 @@ LangString remove_files ${LANG_SIMPCHINESE} "删除文件"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
 LangString remove_shortcuts ${LANG_SIMPCHINESE} "删除快捷方式"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_SIMPCHINESE} "删除文件关联"
+LangString remove_associations ${LANG_SIMPCHINESE} "解除文件关联"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
 LangString remove_registry ${LANG_SIMPCHINESE} "删除注册表键"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
 LangString remove_conf ${LANG_SIMPCHINESE} "删除配置文件"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_SIMPCHINESE} "删除Windows防火墙规则"
+LangString remove_firewall ${LANG_SIMPCHINESE} "删除 Windows 防火墙规则"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_SIMPCHINESE} "正在删除Windows防火墙规则"
+LangString remove_firewallinfo ${LANG_SIMPCHINESE} "正在删除 Windows 防火墙规则"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_SIMPCHINESE} "删除种子和缓存数据"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
 LangString uninst_warning ${LANG_SIMPCHINESE} "qBittorrent 正在运行。 卸载前请关闭程序。"
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_SIMPCHINESE} "不删除 .torrent 关联。 关联的是:"
+LangString uninst_tor_warn ${LANG_SIMPCHINESE} "未解除与 .torrent 的关联。 它已与另一程序关联:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_SIMPCHINESE} "不删除磁力关联。 关联的是:"
+LangString uninst_mag_warn ${LANG_SIMPCHINESE} "未解除与 磁力链接 的关联。 它已与另一程序关联:"

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.9"
+!define PROG_VERSION "4.4.1"
 
 !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-2021 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2022 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

m4/ax_boost_system.m4

@@ -1,121 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_boost_system.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_BOOST_SYSTEM
-#
-# DESCRIPTION
-#
-#   Test for System library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
-#
-#   This macro calls:
-#
-#     AC_SUBST(BOOST_SYSTEM_LIB)
-#
-#   And sets:
-#
-#     HAVE_BOOST_SYSTEM
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
-#   Copyright (c) 2008 Michael Tindal
-#   Copyright (c) 2008 Daniel Casimiro <dan.casimiro@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 20
-
-AC_DEFUN([AX_BOOST_SYSTEM],
-[
-	AC_ARG_WITH([boost-system],
-	AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@],
-                   [use the System library from boost - it is possible to specify a certain library for the linker
-                        e.g. --with-boost-system=boost_system-gcc-mt ]),
-        [
-        if test "$withval" = "no"; then
-			want_boost="no"
-        elif test "$withval" = "yes"; then
-            want_boost="yes"
-            ax_boost_user_system_lib=""
-        else
-		    want_boost="yes"
-		ax_boost_user_system_lib="$withval"
-		fi
-        ],
-        [want_boost="yes"]
-	)
-
-	if test "x$want_boost" = "xyes"; then
-        AC_REQUIRE([AC_PROG_CC])
-        AC_REQUIRE([AC_CANONICAL_BUILD])
-		CPPFLAGS_SAVED="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-		export CPPFLAGS
-
-		LDFLAGS_SAVED="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-		export LDFLAGS
-
-        AC_CACHE_CHECK(whether the Boost::System library is available,
-					   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::error_category *a = 0;]])],
-                   ax_cv_boost_system=yes, ax_cv_boost_system=no)
-			 CXXFLAGS=$CXXFLAGS_SAVE
-             AC_LANG_POP([C++])
-		])
-		if test "x$ax_cv_boost_system" = "xyes"; then
-			AC_SUBST(BOOST_CPPFLAGS)
-
-			AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available])
-            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
-
-			LDFLAGS_SAVE=$LDFLAGS
-            if test "x$ax_boost_user_system_lib" = "x"; then
-                for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                if test "x$link_system" != "xyes"; then
-                for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
-                     ax_lib=${libextension}
-				    AC_CHECK_LIB($ax_lib, exit,
-                                 [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                 [link_system="no"])
-				done
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-				      AC_CHECK_LIB($ax_lib, exit,
-                                   [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
-                                   [link_system="no"])
-                  done
-
-            fi
-            if test "x$ax_lib" = "x"; then
-                AC_MSG_ERROR(Could not find a version of the Boost::System library!)
-            fi
-			if test "x$link_system" = "xno"; then
-				AC_MSG_ERROR(Could not link against $ax_lib !)
-			fi
-		fi
-
-		CPPFLAGS="$CPPFLAGS_SAVED"
-	LDFLAGS="$LDFLAGS_SAVED"
-	fi
-])

m4/pkg.m4

@@ -1,29 +1,60 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# serial 12 (pkg-config-0.29.2)
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -45,18 +76,19 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -66,8 +98,10 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -79,10 +113,11 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
 
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -90,26 +125,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
 
 
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
 AC_DEFUN([PKG_CHECK_MODULES],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -156,16 +189,40 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
 
 
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -176,16 +233,18 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
 
 
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -196,13 +255,15 @@ AC_ARG_WITH([noarch-pkgconfigdir],
 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
 
 
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
 AC_DEFUN([PKG_CHECK_VAR],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -211,4 +272,4 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR

m4/qbittorrent.m4

@@ -5,9 +5,9 @@
 # Sets the QT_QMAKE variable to the path of Qt5 qmake if found.
 # --------------------------------------
 AC_DEFUN([FIND_QT5],
-[PKG_CHECK_EXISTS([Qt5Core >= 5.11],
+[PKG_CHECK_EXISTS([Qt5Core >= 5.15.2],
                  [PKG_CHECK_VAR(QT_QMAKE,
-                                [Qt5Core >= 5.11],
+                                [Qt5Core >= 5.15.2],
                                 [host_bins])
                  ])
 
@@ -18,7 +18,7 @@ AS_IF([test -f "$QT_QMAKE/qmake"],
                              [QT_QMAKE=""])
               ])
 
-AC_MSG_CHECKING([for Qt5 qmake >= 5.11])
+AC_MSG_CHECKING([for Qt5 qmake >= 5.15.2])
 AS_IF([test "x$QT_QMAKE" != "x"],
       [AC_MSG_RESULT([$QT_QMAKE])],
       [AC_MSG_RESULT([not found])]
@@ -29,8 +29,8 @@ AS_IF([test "x$QT_QMAKE" != "x"],
 # Sets the HAVE_QTDBUS variable to true or false.
 # --------------------------------------
 AC_DEFUN([FIND_QTDBUS],
-       [AC_MSG_CHECKING([for Qt5DBus >= 5.11])
-       PKG_CHECK_EXISTS([Qt5DBus >= 5.11],
+       [AC_MSG_CHECKING([for Qt5DBus >= 5.15.2])
+       PKG_CHECK_EXISTS([Qt5DBus >= 5.15.2],
                         [AC_MSG_RESULT([found])
                          HAVE_QTDBUS=[true]],
                         [AC_MSG_RESULT([not found])

macxconf.pri

@@ -9,6 +9,8 @@ else {
 
 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
 
+DEFINES += _DARWIN_FEATURE_64_BIT_INODE
+
 LIBS += -framework Carbon -framework IOKit -framework AppKit
 
 QT_LANG_PATH = ../dist/qt-translations

src/CMakeLists.txt

@@ -1,12 +1,13 @@
-if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
-    find_package(LibtorrentRasterbar QUIET ${minLibtorrentVersion} COMPONENTS torrent-rasterbar)
+macro(find_libtorrent version)
+    if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
+        find_package(LibtorrentRasterbar QUIET ${version} COMPONENTS torrent-rasterbar)
         if (NOT LibtorrentRasterbar_FOUND)
             include(FindPkgConfig)
-        pkg_check_modules(LIBTORRENT_RASTERBAR IMPORTED_TARGET GLOBAL "libtorrent-rasterbar>=${minLibtorrentVersion}")
-        if (NOT LIBTORRENT_RASTERBAR_FOUND)
+            pkg_check_modules(LibtorrentRasterbar IMPORTED_TARGET GLOBAL "libtorrent-rasterbar>=${version}")
+            if (NOT LibtorrentRasterbar_FOUND)
                 message(
                     FATAL_ERROR
-                "Package LibtorrentRasterbar >= ${minLibtorrentVersion} not found"
+                    "Package LibtorrentRasterbar >= ${version} not found"
                     " with CMake or pkg-config.\n- Set LibtorrentRasterbar_DIR to a directory containing"
                     " a LibtorrentRasterbarConfig.cmake file or add the installation prefix of LibtorrentRasterbar"
                     " to CMAKE_PREFIX_PATH.\n- Alternatively, make sure there is a valid libtorrent-rasterbar.pc"
@@ -14,34 +15,52 @@ if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
                     " to specify additional search paths if needed)."
                 )
             endif()
-        add_library(LibtorrentRasterbar::torrent-rasterbar ALIAS PkgConfig::LIBTORRENT_RASTERBAR)
+            add_library(LibtorrentRasterbar::torrent-rasterbar ALIAS PkgConfig::LibtorrentRasterbar)
             # force a fake package to show up in the feature summary
             set_property(GLOBAL APPEND PROPERTY
                 PACKAGES_FOUND
-            "LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
+                "LibtorrentRasterbar via pkg-config (version >= ${version})"
             )
-        set_package_properties("LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
+            set_package_properties("LibtorrentRasterbar via pkg-config (version >= ${version})"
                 PROPERTIES
                 TYPE REQUIRED
             )
         else()
             set_package_properties(LibtorrentRasterbar PROPERTIES TYPE REQUIRED)
         endif()
-else()
-    find_package(LibtorrentRasterbar ${minLibtorrentVersion} REQUIRED COMPONENTS torrent-rasterbar)
+    else()
+        find_package(LibtorrentRasterbar ${version} REQUIRED COMPONENTS torrent-rasterbar)
+    endif()
+endmacro()
+
+find_libtorrent(${minLibtorrent1Version})
+if (LibtorrentRasterbar_FOUND AND (LibtorrentRasterbar_VERSION VERSION_GREATER_EQUAL 2.0))
+    find_libtorrent(${minLibtorrentVersion})
 endif()
+
 # force variable type so that it always shows up in ccmake/cmake-gui frontends
 set_property(CACHE LibtorrentRasterbar_DIR PROPERTY TYPE PATH)
 find_package(Boost ${minBoostVersion} REQUIRED)
 find_package(OpenSSL ${minOpenSSLVersion} REQUIRED)
 find_package(ZLIB ${minZlibVersion} REQUIRED)
-find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS Core Network Xml LinguistTools)
-if (DBUS)
-    find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS DBus)
+if (QT6)
+    find_package(Qt6 ${minQt6Version} REQUIRED COMPONENTS Core Network Sql Xml LinguistTools)
+    if (DBUS)
+        find_package(Qt6 ${minQt6Version} REQUIRED COMPONENTS DBus)
+        set_package_properties(Qt6DBus PROPERTIES
+            DESCRIPTION "Qt6 module for inter-process communication over the D-Bus protocol"
+            PURPOSE "Required by the DBUS feature"
+        )
+    endif()
+else()
+    find_package(Qt5 ${minQt5Version} REQUIRED COMPONENTS Core Network Sql Xml LinguistTools)
+    if (DBUS)
+        find_package(Qt5 ${minQt5Version} REQUIRED COMPONENTS DBus)
         set_package_properties(Qt5DBus PROPERTIES
             DESCRIPTION "Qt5 module for inter-process communication over the D-Bus protocol"
             PURPOSE "Required by the DBUS feature"
         )
+    endif()
 endif()
 
 # automatically call Qt moc, rcc and uic as needed for all targets by default
@@ -60,12 +79,15 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(base)
 
 if (GUI)
-    find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS Widgets Svg)
-    if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-        find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS MacExtras)
-    elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS WinExtras)
+    if (QT6)
+        find_package(Qt6 ${minQt6Version} REQUIRED COMPONENTS Widgets Svg)
+    else()
+        find_package(Qt5 ${minQt5Version} REQUIRED COMPONENTS Widgets Svg)
+        if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+            find_package(Qt5 ${minQt5Version} REQUIRED COMPONENTS WinExtras)
         endif()
+    endif()
+
     add_subdirectory(gui)
 endif()
 

src/app/CMakeLists.txt

@@ -4,22 +4,14 @@
 # Based on https://gist.github.com/giraldeau/546ba5512a74dfe9d8ea0862d66db412
 file(GLOB QBT_TS_FILES "${qBittorrent_SOURCE_DIR}/src/lang/*.ts")
 set_source_files_properties(${QBT_TS_FILES} PROPERTIES OUTPUT_LOCATION "${qBittorrent_BINARY_DIR}/src/lang")
-if (Qt5_VERSION VERSION_LESS 5.12)
-    qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES})
-else()
-    qt5_add_translation(QBT_QM_FILES ${QBT_TS_FILES} OPTIONS -silent)
-endif()
+qt_add_translation(QBT_QM_FILES ${QBT_TS_FILES} OPTIONS -silent)
 configure_file("${qBittorrent_SOURCE_DIR}/src/lang/lang.qrc" "${qBittorrent_BINARY_DIR}/src/lang/lang.qrc" COPYONLY)
 
 if (WEBUI)
     file(GLOB QBT_WEBUI_TS_FILES "${qBittorrent_SOURCE_DIR}/src/webui/www/translations/*.ts")
     set_source_files_properties(${QBT_WEBUI_TS_FILES}
         PROPERTIES OUTPUT_LOCATION "${qBittorrent_BINARY_DIR}/src/webui/www/translations")
-    if (Qt5_VERSION VERSION_LESS 5.12)
-        qt5_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES})
-    else()
-        qt5_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES} OPTIONS -silent)
-    endif()
+    qt_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES} OPTIONS -silent)
     configure_file("${qBittorrent_SOURCE_DIR}/src/webui/www/translations/webui_translations.qrc"
         "${qBittorrent_BINARY_DIR}/src/webui/www/translations/webui_translations.qrc" COPYONLY)
 endif()
@@ -147,11 +139,7 @@ endif()
 if (GUI)
     target_link_libraries(qbt_app PRIVATE qbt_gui)
     if ((CMAKE_SYSTEM_NAME STREQUAL "Windows") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-        if (Qt5_VERSION VERSION_LESS 5.14)
-            set_property(TARGET qbt_app APPEND PROPERTY QT_PLUGINS Qt5::QSvgIconPlugin Qt5::QSvgPlugin)
-        else()
-            qt_import_plugins(qbt_app INCLUDE Qt5::QSvgIconPlugin Qt5::QSvgPlugin)
-        endif()
+        qt_import_plugins(qbt_app INCLUDE Qt::QSvgIconPlugin Qt::QSvgPlugin)
     endif()
 endif()
 

src/app/application.cpp

@@ -78,9 +78,9 @@
 #include "base/search/searchpluginmanager.h"
 #include "base/settingsstorage.h"
 #include "base/torrentfileswatcher.h"
+#include "base/utils/compare.h"
 #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"
@@ -100,22 +100,10 @@
 namespace
 {
 #define SETTINGS_KEY(name) "Application/" name
-
-    // FileLogger properties keys
-#define FILELOGGER_SETTINGS_KEY(name) QStringLiteral(SETTINGS_KEY("FileLogger/") name)
-    const QString KEY_FILELOGGER_ENABLED = FILELOGGER_SETTINGS_KEY("Enabled");
-    const QString KEY_FILELOGGER_PATH = FILELOGGER_SETTINGS_KEY("Path");
-    const QString KEY_FILELOGGER_BACKUP = FILELOGGER_SETTINGS_KEY("Backup");
-    const QString KEY_FILELOGGER_DELETEOLD = FILELOGGER_SETTINGS_KEY("DeleteOld");
-    const QString KEY_FILELOGGER_MAXSIZEBYTES = FILELOGGER_SETTINGS_KEY("MaxSizeBytes");
-    const QString KEY_FILELOGGER_AGE = FILELOGGER_SETTINGS_KEY("Age");
-    const QString KEY_FILELOGGER_AGETYPE = FILELOGGER_SETTINGS_KEY("AgeType");
-
-    // just a shortcut
-    inline SettingsStorage *settings() { return  SettingsStorage::instance(); }
+#define FILELOGGER_SETTINGS_KEY(name) (SETTINGS_KEY("FileLogger/") name)
 
     const QString LOG_FOLDER = QStringLiteral("logs");
-    const QChar PARAMS_SEPARATOR = '|';
+    const QChar PARAMS_SEPARATOR = QLatin1Char('|');
 
     const QString DEFAULT_PORTABLE_MODE_PROFILE_DIR = QStringLiteral("profile");
 
@@ -133,6 +121,13 @@ Application::Application(int &argc, char **argv)
     , m_running(false)
     , m_shutdownAct(ShutdownDialogAction::Exit)
     , m_commandLineArgs(parseCommandLine(this->arguments()))
+    , m_storeFileLoggerEnabled(FILELOGGER_SETTINGS_KEY("Enabled"))
+    , m_storeFileLoggerBackup(FILELOGGER_SETTINGS_KEY("Backup"))
+    , m_storeFileLoggerDeleteOld(FILELOGGER_SETTINGS_KEY("DeleteOld"))
+    , m_storeFileLoggerMaxSize(FILELOGGER_SETTINGS_KEY("MaxSizeBytes"))
+    , m_storeFileLoggerAge(FILELOGGER_SETTINGS_KEY("Age"))
+    , m_storeFileLoggerAgeType(FILELOGGER_SETTINGS_KEY("AgeType"))
+    , m_storeFileLoggerPath(FILELOGGER_SETTINGS_KEY("Path"))
 {
     qRegisterMetaType<Log::Msg>("Log::Msg");
     qRegisterMetaType<Log::Peer>("Log::Peer");
@@ -141,7 +136,9 @@ Application::Application(int &argc, char **argv)
     setOrganizationDomain("qbittorrent.org");
 #if !defined(DISABLE_GUI)
     setDesktopFileName("org.qbittorrent.qBittorrent");
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     setAttribute(Qt::AA_UseHighDpiPixmaps, true);  // opt-in to the high DPI pixmap support
+#endif
     setQuitOnLastWindowClosed(false);
     QPixmapCache::setCacheLimit(PIXMAP_CACHE_SIZE);
 #endif
@@ -152,17 +149,11 @@ Application::Application(int &argc, char **argv)
     const QString profileDir = portableModeEnabled
         ? QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(DEFAULT_PORTABLE_MODE_PROFILE_DIR)
         : m_commandLineArgs.profileDir;
-#ifdef Q_OS_WIN
-    const QString instanceId = (profileDir + (m_commandLineArgs.configurationName.isEmpty() ? QString {} : ('/' + m_commandLineArgs.configurationName))).toLower();
-#else
-    const QString instanceId = profileDir + (m_commandLineArgs.configurationName.isEmpty() ? QString {} : ('/' + m_commandLineArgs.configurationName));
-#endif
-    const QString appId = QLatin1String("qBittorrent-") + Utils::Misc::getUserIDString() + '@' + instanceId;
-    m_instanceManager = new ApplicationInstanceManager {appId, this};
-
     Profile::initInstance(profileDir, m_commandLineArgs.configurationName,
                         (m_commandLineArgs.relativeFastresumePaths || portableModeEnabled));
 
+    m_instanceManager = new ApplicationInstanceManager {Profile::instance()->location(SpecialFolder::Config), this};
+
     Logger::initInstance();
     SettingsStorage::initInstance();
     Preferences::initInstance();
@@ -215,7 +206,7 @@ const QBtCommandLineParameters &Application::commandLineArgs() const
 
 bool Application::isFileLoggerEnabled() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true);
+    return m_storeFileLoggerEnabled.get(true);
 }
 
 void Application::setFileLoggerEnabled(const bool value)
@@ -224,49 +215,48 @@ void Application::setFileLoggerEnabled(const bool value)
         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);
+    m_storeFileLoggerEnabled = value;
 }
 
 QString Application::fileLoggerPath() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_PATH
-        , QString {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER});
+    return m_storeFileLoggerPath.get(QDir(specialFolderLocation(SpecialFolder::Data)).absoluteFilePath(LOG_FOLDER));
 }
 
 void Application::setFileLoggerPath(const QString &path)
 {
     if (m_fileLogger)
         m_fileLogger->changePath(path);
-    settings()->storeValue(KEY_FILELOGGER_PATH, path);
+    m_storeFileLoggerPath = path;
 }
 
 bool Application::isFileLoggerBackup() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true);
+    return m_storeFileLoggerBackup.get(true);
 }
 
 void Application::setFileLoggerBackup(const bool value)
 {
     if (m_fileLogger)
         m_fileLogger->setBackup(value);
-    settings()->storeValue(KEY_FILELOGGER_BACKUP, value);
+    m_storeFileLoggerBackup = value;
 }
 
 bool Application::isFileLoggerDeleteOld() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true);
+    return m_storeFileLoggerDeleteOld.get(true);
 }
 
 void Application::setFileLoggerDeleteOld(const bool value)
 {
     if (value && m_fileLogger)
         m_fileLogger->deleteOld(fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
-    settings()->storeValue(KEY_FILELOGGER_DELETEOLD, value);
+    m_storeFileLoggerDeleteOld = value;
 }
 
 int Application::fileLoggerMaxSize() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE);
+    const int val = m_storeFileLoggerMaxSize.get(DEFAULT_FILELOG_SIZE);
     return std::min(std::max(val, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
 }
 
@@ -275,34 +265,34 @@ void Application::setFileLoggerMaxSize(const int bytes)
     const int clampedValue = std::min(std::max(bytes, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
     if (m_fileLogger)
         m_fileLogger->setMaxSize(clampedValue);
-    settings()->storeValue(KEY_FILELOGGER_MAXSIZEBYTES, clampedValue);
+    m_storeFileLoggerMaxSize = clampedValue;
 }
 
 int Application::fileLoggerAge() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1);
+    const int val = m_storeFileLoggerAge.get(1);
     return std::min(std::max(val, 1), 365);
 }
 
 void Application::setFileLoggerAge(const int value)
 {
-    settings()->storeValue(KEY_FILELOGGER_AGE, std::min(std::max(value, 1), 365));
+    m_storeFileLoggerAge = std::min(std::max(value, 1), 365);
 }
 
 int Application::fileLoggerAgeType() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1);
+    const int val = m_storeFileLoggerAgeType.get(1);
     return ((val < 0) || (val > 2)) ? 1 : val;
 }
 
 void Application::setFileLoggerAgeType(const int value)
 {
-    settings()->storeValue(KEY_FILELOGGER_AGETYPE, ((value < 0) || (value > 2)) ? 1 : value);
+    m_storeFileLoggerAgeType = ((value < 0) || (value > 2)) ? 1 : value;
 }
 
 void Application::processMessage(const QString &message)
 {
-    const QStringList params = message.split(PARAMS_SEPARATOR, QString::SkipEmptyParts);
+    const QStringList params = message.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts);
     // If Application is not running (i.e., other
     // components are not ready) store params
     if (m_running)
@@ -350,13 +340,15 @@ void Application::runExternalProgram(const BitTorrent::Torrent *torrent) const
 #endif
             break;
         case u'G':
-            {
-                QStringList tags = torrent->tags().values();
-                std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
-                program.replace(i, 2, tags.join(','));
-            }
+            program.replace(i, 2, torrent->tags().join(QLatin1String(",")));
             break;
         case u'I':
+            program.replace(i, 2, (torrent->infoHash().v1().isValid() ? torrent->infoHash().v1().toString() : QLatin1String("-")));
+            break;
+        case u'J':
+            program.replace(i, 2, (torrent->infoHash().v2().isValid() ? torrent->infoHash().v2().toString() : QLatin1String("-")));
+            break;
+        case u'K':
             program.replace(i, 2, torrent->id().toString());
             break;
         case u'L':
@@ -433,16 +425,12 @@ void Application::runExternalProgram(const BitTorrent::Torrent *torrent) const
     // enable command injection via torrent name and other arguments
     // (especially when some automated download mechanism has been setup).
     // See: https://github.com/qbittorrent/qBittorrent/issues/10925
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
     QStringList args = QProcess::splitCommand(program);
     if (args.isEmpty())
         return;
 
     const QString command = args.takeFirst();
     QProcess::startDetached(command, args);
-#else
-    QProcess::startDetached(program);
-#endif
 #endif
 }
 
@@ -563,7 +551,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@addPaused=")))
         {
-            torrentParams.addPaused = (param.midRef(11).toInt() != 0);
+            torrentParams.addPaused = (QStringView(param).mid(11).toInt() != 0);
             continue;
         }
 
@@ -593,7 +581,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@skipDialog=")))
         {
-            skipTorrentDialog = (param.midRef(12).toInt() != 0);
+            skipTorrentDialog = (QStringView(param).mid(12).toInt() != 0);
             continue;
         }
 
@@ -657,18 +645,19 @@ int Application::exec(const QStringList &params)
 
 #ifdef DISABLE_GUI
 #ifndef DISABLE_WEBUI
-    Preferences *const pref = Preferences::instance();
-    // Display some information to the user
+    const Preferences *pref = Preferences::instance();
+
+    const auto scheme = QString::fromLatin1(pref->isWebUiHttpsEnabled() ? "https" : "http");
+    const auto url = QString::fromLatin1("%1://localhost:%2\n").arg(scheme, QString::number(pref->getWebUiPort()));
     const QString mesg = QString::fromLatin1("\n******** %1 ********\n").arg(tr("Information"))
-        + tr("To control qBittorrent, access the Web UI at %1")
-            .arg(QString("http://localhost:") + QString::number(pref->getWebUiPort())) + '\n';
-    printf("%s", qUtf8Printable(mesg));
+        + tr("To control qBittorrent, access the WebUI at: %1").arg(url);
+    printf("%s\n", qUtf8Printable(mesg));
 
     if (pref->getWebUIPassword() == "ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtHAjU9b3b7uB8NR1Gur2hmQCvCDpm39Q+PsJRJPaCU51dEiz+dTzh8qbPsL8WkFljQYFQ==")
     {
         const QString warning = tr("The Web UI administrator username is: %1").arg(pref->getWebUiUsername()) + '\n'
-            + tr("The Web UI administrator password is still the default one: %1").arg("adminadmin") + '\n'
-            + tr("This is a security risk, please consider changing your password from program preferences.") + '\n';
+            + tr("The Web UI administrator password has not been changed from the default: %1").arg("adminadmin") + '\n'
+            + tr("This is a security risk, please change your password in program preferences.") + '\n';
         printf("%s", qUtf8Printable(warning));
     }
 #endif // DISABLE_WEBUI

src/app/application.h

@@ -47,6 +47,7 @@ class QSessionManager;
 using BaseApplication = QCoreApplication;
 #endif // DISABLE_GUI
 
+#include "base/settingvalue.h"
 #include "base/types.h"
 #include "cmdoptions.h"
 
@@ -71,7 +72,7 @@ namespace RSS
 class Application final : public BaseApplication
 {
     Q_OBJECT
-    Q_DISABLE_COPY(Application)
+    Q_DISABLE_COPY_MOVE(Application)
 
 public:
     Application(int &argc, char **argv);
@@ -120,6 +121,11 @@ private slots:
 #endif
 
 private:
+    void initializeTranslation();
+    void processParams(const QStringList &params);
+    void runExternalProgram(const BitTorrent::Torrent *torrent) const;
+    void sendNotificationEmail(const BitTorrent::Torrent *torrent);
+
     ApplicationInstanceManager *m_instanceManager = nullptr;
     bool m_running;
     ShutdownDialogAction m_shutdownAct;
@@ -140,8 +146,11 @@ private:
     QTranslator m_translator;
     QStringList m_paramsQueue;
 
-    void initializeTranslation();
-    void processParams(const QStringList &params);
-    void runExternalProgram(const BitTorrent::Torrent *torrent) const;
-    void sendNotificationEmail(const BitTorrent::Torrent *torrent);
+    SettingValue<bool> m_storeFileLoggerEnabled;
+    SettingValue<bool> m_storeFileLoggerBackup;
+    SettingValue<bool> m_storeFileLoggerDeleteOld;
+    SettingValue<int> m_storeFileLoggerMaxSize;
+    SettingValue<int> m_storeFileLoggerAge;
+    SettingValue<int> m_storeFileLoggerAgeType;
+    SettingValue<QString> m_storeFileLoggerPath;
 };

src/app/applicationinstancemanager.cpp

@@ -28,24 +28,27 @@
 
 #include "applicationinstancemanager.h"
 
+#include <QtGlobal>
+
 #ifdef Q_OS_WIN
 #include <windows.h>
-#endif
 
 #include <QDebug>
 #include <QSharedMemory>
+#endif
 
 #include "qtlocalpeer/qtlocalpeer.h"
 
-ApplicationInstanceManager::ApplicationInstanceManager(const QString &appId, QObject *parent)
+ApplicationInstanceManager::ApplicationInstanceManager(const QString &instancePath, QObject *parent)
     : QObject {parent}
-    , m_peer {new QtLocalPeer {this, appId}}
+    , m_peer {new QtLocalPeer {instancePath, this}}
     , m_isFirstInstance {!m_peer->isClient()}
 {
     connect(m_peer, &QtLocalPeer::messageReceived, this, &ApplicationInstanceManager::messageReceived);
 
 #ifdef Q_OS_WIN
-    auto sharedMem = new QSharedMemory {appId + QLatin1String {"-shared-memory-key"}, this};
+    const QString sharedMemoryKey = instancePath + QLatin1String {"/shared-memory"};
+    auto sharedMem = new QSharedMemory {sharedMemoryKey, this};
     if (m_isFirstInstance)
     {
         // First instance creates shared memory and store PID
@@ -79,8 +82,3 @@ bool ApplicationInstanceManager::sendMessage(const QString &message, const int t
 {
     return m_peer->sendMessage(message, timeout);
 }
-
-QString ApplicationInstanceManager::appId() const
-{
-    return m_peer->applicationId();
-}

src/app/applicationinstancemanager.h

@@ -32,16 +32,15 @@
 
 class QtLocalPeer;
 
-class ApplicationInstanceManager : public QObject
+class ApplicationInstanceManager final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(ApplicationInstanceManager)
+    Q_DISABLE_COPY_MOVE(ApplicationInstanceManager)
 
 public:
-    explicit ApplicationInstanceManager(const QString &appId, QObject *parent = nullptr);
+    explicit ApplicationInstanceManager(const QString &instancePath, QObject *parent = nullptr);
 
     bool isFirstInstance() const;
-    QString appId() const;
 
 public slots:
     bool sendMessage(const QString &message, int timeout = 5000);

src/app/cmdoptions.cpp

@@ -526,50 +526,50 @@ QString makeUsage(const QString &prgName)
     QTextStream stream(&text, QIODevice::WriteOnly);
     QString indentation = QString(USAGE_INDENTATION, ' ');
 
-    stream << QObject::tr("Usage:") << '\n';
-    stream << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n';
+    stream << QObject::tr("Usage:") << '\n'
+        << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n'
 
-    stream << QObject::tr("Options:") << '\n';
+        << QObject::tr("Options:") << '\n'
 #if !defined(Q_OS_WIN) || defined(DISABLE_GUI)
-    stream << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n';
+        << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n'
 #endif
-    stream << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n';
-    stream << WEBUI_PORT_OPTION.usage(QObject::tr("port"))
+        << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n'
+        << WEBUI_PORT_OPTION.usage(QObject::tr("port"))
         << wrapText(QObject::tr("Change the Web UI port"))
-           << '\n';
+        << '\n'
 #ifndef DISABLE_GUI
-    stream << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n';
+        << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n'
 #elif !defined(Q_OS_WIN)
-    stream << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n';
+        << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n'
 #endif
     //: Use appropriate short form or abbreviation of "directory"
-    stream << PROFILE_OPTION.usage(QObject::tr("dir"))
-           << wrapText(QObject::tr("Store configuration files in <dir>")) << '\n';
-    stream << CONFIGURATION_OPTION.usage(QObject::tr("name"))
-           << wrapText(QObject::tr("Store configuration files in directories qBittorrent_<name>")) << '\n';
-    stream << RELATIVE_FASTRESUME.usage()
+        << PROFILE_OPTION.usage(QObject::tr("dir"))
+        << wrapText(QObject::tr("Store configuration files in <dir>")) << '\n'
+        << CONFIGURATION_OPTION.usage(QObject::tr("name"))
+        << wrapText(QObject::tr("Store configuration files in directories qBittorrent_<name>")) << '\n'
+        << RELATIVE_FASTRESUME.usage()
         << wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative "
-                                         "to the profile directory")) << '\n';
-    stream << Option::padUsageText(QObject::tr("files or URLs"))
+                                "to the profile directory")) << '\n'
+        << Option::padUsageText(QObject::tr("files or URLs"))
         << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n'
-           << '\n';
+        << '\n'
 
-    stream << wrapText(QObject::tr("Options when adding new torrents:"), 0) << '\n';
-    stream << SAVE_PATH_OPTION.usage(QObject::tr("path")) << wrapText(QObject::tr("Torrent save path")) << '\n';
-    stream << PAUSED_OPTION.usage() << wrapText(QObject::tr("Add torrents as started or paused")) << '\n';
-    stream << SKIP_HASH_CHECK_OPTION.usage() << wrapText(QObject::tr("Skip hash check")) << '\n';
-    stream << CATEGORY_OPTION.usage(QObject::tr("name"))
+        << wrapText(QObject::tr("Options when adding new torrents:"), 0) << '\n'
+        << SAVE_PATH_OPTION.usage(QObject::tr("path")) << wrapText(QObject::tr("Torrent save path")) << '\n'
+        << PAUSED_OPTION.usage() << wrapText(QObject::tr("Add torrents as started or paused")) << '\n'
+        << SKIP_HASH_CHECK_OPTION.usage() << wrapText(QObject::tr("Skip hash check")) << '\n'
+        << CATEGORY_OPTION.usage(QObject::tr("name"))
         << wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be "
-                                   "created.")) << '\n';
-    stream << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n';
-    stream << FIRST_AND_LAST_OPTION.usage()
-           << wrapText(QObject::tr("Download first and last pieces first")) << '\n';
-    stream << SKIP_DIALOG_OPTION.usage()
+                                "created.")) << '\n'
+        << SEQUENTIAL_OPTION.usage() << wrapText(QObject::tr("Download files in sequential order")) << '\n'
+        << FIRST_AND_LAST_OPTION.usage()
+        << wrapText(QObject::tr("Download first and last pieces first")) << '\n'
+        << SKIP_DIALOG_OPTION.usage()
         << wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a "
-                                   "torrent.")) << '\n';
-    stream << '\n';
+                                "torrent.")) << '\n'
+        << '\n'
 
-    stream << wrapText(QObject::tr("Option values may be supplied via environment variables. For option named "
+        << wrapText(QObject::tr("Option values may be supplied via environment variables. For option named "
                                 "'parameter-name', environment variable name is 'QBT_PARAMETER_NAME' (in upper "
                                 "case, '-' replaced with '_'). To pass flag values, set the variable to '1' or "
                                 "'TRUE'. For example, to disable the splash screen: "), 0) << "\n"

src/app/filelogger.cpp

@@ -126,7 +126,9 @@ void FileLogger::addLogMessage(const Log::Msg &msg)
     if (!m_logFile.isOpen()) return;
 
     QTextStream stream(&m_logFile);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     stream.setCodec("UTF-8");
+#endif
 
     switch (msg.type)
     {

src/app/filelogger.h

@@ -40,7 +40,7 @@ namespace Log
 class FileLogger : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(FileLogger)
+    Q_DISABLE_COPY_MOVE(FileLogger)
 
 public:
     enum FileLogAgeType

src/app/main.cpp

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
     // We must save it here because QApplication constructor may change it
     bool isOneArg = (argc == 2);
 
-#if !defined(DISABLE_GUI) && (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && !defined(DISABLE_GUI)
     // Attribute Qt::AA_EnableHighDpiScaling must be set before QCoreApplication is created
     if (qgetenv("QT_ENABLE_HIGHDPI_SCALING").isEmpty() && qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR").isEmpty())
         Application::setAttribute(Qt::AA_EnableHighDpiScaling, true);
@@ -188,7 +188,6 @@ int main(int argc, char *argv[])
 #ifndef DISABLE_GUI
             if (!userAgreesWithLegalNotice())
                 return EXIT_SUCCESS;
-
 #elif defined(Q_OS_WIN)
             if (_isatty(_fileno(stdin))
                 && _isatty(_fileno(stdout))
@@ -201,6 +200,8 @@ int main(int argc, char *argv[])
                 && !userAgreesWithLegalNotice())
                 return EXIT_SUCCESS;
 #endif
+
+            setCurrentMigrationVersion();
         }
 
         // Check if qBittorrent is already running for this user
@@ -235,7 +236,7 @@ int main(int argc, char *argv[])
         // 3. https://bugreports.qt.io/browse/QTBUG-46015
 
         qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
-#if !defined(DISABLE_GUI)
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && !defined(DISABLE_GUI)
         // this is the default in Qt6
         app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif

src/app/qtlocalpeer/qtlocalpeer.cpp

@@ -68,20 +68,17 @@
 
 #include "qtlocalpeer.h"
 
-#if defined(Q_OS_UNIX)
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
+#include <QtGlobal>
+
+#if defined(Q_OS_WIN)
+#include <Windows.h>
 #endif
 
-#include <QCoreApplication>
 #include <QDataStream>
-#include <QDir>
+#include <QFileInfo>
 #include <QLocalServer>
 #include <QLocalSocket>
 
-#include "base/utils/misc.h"
-
 namespace QtLP_Private
 {
 #include "qtlockedfile.cpp"
@@ -93,75 +90,49 @@ namespace QtLP_Private
 #endif
 }
 
-const char* QtLocalPeer::ack = "ack";
+const char ACK[] = "ack";
 
-QtLocalPeer::QtLocalPeer(QObject *parent, const QString &appId)
+QtLocalPeer::QtLocalPeer(const QString &path, QObject *parent)
     : QObject(parent)
-    , id(appId)
+    , m_socketName(path + QLatin1String("/ipc-socket"))
+    , m_server(new QLocalServer(this))
 {
-    QString prefix = id;
-    if (id.isEmpty())
-    {
-        id = QCoreApplication::applicationFilePath();
-#if defined(Q_OS_WIN)
-        id = id.toLower();
-#endif
-        prefix = id.section(QLatin1Char('/'), -1);
-    }
-    prefix.remove(QRegExp("[^a-zA-Z]"));
-    prefix.truncate(6);
+    m_server->setSocketOptions(QLocalServer::UserAccessOption);
 
-    QByteArray idc = id.toUtf8();
-    quint16 idNum = qChecksum(idc.constData(), idc.size());
-    socketName = QLatin1String("qtsingleapp-") + prefix
-                 + QLatin1Char('-') + QString::number(idNum, 16);
-
-#if defined(Q_OS_WIN)
-    DWORD sessionId = 0;
-    ::ProcessIdToSessionId(GetCurrentProcessId(), &sessionId);
-    socketName += (QLatin1Char('-') + QString::number(sessionId, 16));
-#else
-    socketName += (QLatin1Char('-') + QString::number(::getuid(), 16));
-#endif
-
-    server = new QLocalServer(this);
-    server->setSocketOptions(QLocalServer::UserAccessOption);
-    QString lockName = QDir(QDir::tempPath()).absolutePath()
-                       + QLatin1Char('/') + socketName
-                       + QLatin1String("-lockfile");
-    lockFile.setFileName(lockName);
-    lockFile.open(QIODevice::ReadWrite);
+    m_lockFile.setFileName(path + QLatin1String("/lockfile"));
+    m_lockFile.open(QIODevice::ReadWrite);
 }
 
 QtLocalPeer::~QtLocalPeer()
 {
     if (!isClient())
     {
-        lockFile.unlock();
-        lockFile.remove();
+        m_lockFile.unlock();
+        m_lockFile.remove();
     }
 }
 
 bool QtLocalPeer::isClient()
 {
-    if (lockFile.isLocked())
+    if (m_lockFile.isLocked())
         return false;
 
-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
+    if (!m_lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
         return true;
 
-    bool res = server->listen(socketName);
+    bool res = m_server->listen(m_socketName);
 #if defined(Q_OS_UNIX)
     // ### Workaround
-    if (!res && server->serverError() == QAbstractSocket::AddressInUseError)
+    if (!res && m_server->serverError() == QAbstractSocket::AddressInUseError)
     {
-        QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName);
-        res = server->listen(socketName);
+        QFile::remove(m_socketName);
+        res = m_server->listen(m_socketName);
     }
 #endif
     if (!res)
-        qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
-    connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
+        qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qUtf8Printable(m_server->errorString()));
+
+    connect(m_server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
     return false;
 }
 
@@ -175,7 +146,7 @@ bool QtLocalPeer::sendMessage(const QString &message, const int timeout)
     for(int i = 0; i < 2; i++)
     {
         // Try twice, in case the other instance is just starting up
-        socket.connectToServer(socketName);
+        socket.connectToServer(m_socketName);
         connOk = socket.waitForConnected(timeout/2);
         if (connOk || i)
             break;
@@ -198,19 +169,14 @@ bool QtLocalPeer::sendMessage(const QString &message, const int timeout)
     {
         res &= socket.waitForReadyRead(timeout);   // wait for ack
         if (res)
-            res &= (socket.read(qstrlen(ack)) == ack);
+            res &= (socket.read(qstrlen(ACK)) == ACK);
     }
     return res;
 }
 
-QString QtLocalPeer::applicationId() const
-{
-    return id;
-}
-
 void QtLocalPeer::receiveConnection()
 {
-    QLocalSocket* socket = server->nextPendingConnection();
+    QLocalSocket *socket = m_server->nextPendingConnection();
     if (!socket)
         return;
 
@@ -254,7 +220,7 @@ void QtLocalPeer::receiveConnection()
         return;
     }
     QString message(QString::fromUtf8(uMsg));
-    socket->write(ack, qstrlen(ack));
+    socket->write(ACK, qstrlen(ACK));
     socket->waitForBytesWritten(1000);
     socket->waitForDisconnected(1000); // make sure client reads ack
     delete socket;

src/app/qtlocalpeer/qtlocalpeer.h

@@ -68,34 +68,32 @@
 
 #pragma once
 
+#include <QString>
+
 #include "qtlockedfile.h"
 
 class QLocalServer;
 
-class QtLocalPeer : public QObject
+class QtLocalPeer final : public QObject
 {
     Q_OBJECT
+    Q_DISABLE_COPY_MOVE(QtLocalPeer)
 
 public:
-    QtLocalPeer(QObject *parent = nullptr, const QString &appId = QString());
+    QtLocalPeer(const QString &path, QObject *parent = nullptr);
     ~QtLocalPeer() override;
 
     bool isClient();
     bool sendMessage(const QString &message, int timeout);
-    QString applicationId() const;
 
 signals:
     void messageReceived(const QString &message);
 
-protected slots:
+private slots:
     void receiveConnection();
 
-protected:
-    QString id;
-    QString socketName;
-    QLocalServer *server = nullptr;
-    QtLP_Private::QtLockedFile lockFile;
-
 private:
-    static const char* ack;
+    QString m_socketName;
+    QLocalServer *m_server = nullptr;
+    QtLP_Private::QtLockedFile m_lockFile;
 };

src/app/qtlocalpeer/qtlockedfile.cpp

@@ -108,11 +108,7 @@
 
     \sa QFile::QFile()
 */
-QtLockedFile::QtLockedFile()
-    : QFile()
-{
-    m_lock_mode = NoLock;
-}
+QtLockedFile::QtLockedFile() = default;
 
 /*!
     Constructs an unlocked QtLockedFile object with file \a name. This
@@ -124,7 +120,6 @@ QtLockedFile::QtLockedFile()
 QtLockedFile::QtLockedFile(const QString &name)
     : QFile(name)
 {
-    m_lock_mode = NoLock;
 }
 
 /*!
@@ -142,7 +137,8 @@ QtLockedFile::QtLockedFile(const QString &name)
 */
 bool QtLockedFile::open(const OpenMode mode)
 {
-    if (mode & QIODevice::Truncate) {
+    if (mode & QIODevice::Truncate)
+    {
         qWarning("QtLockedFile::open(): Truncate mode not allowed.");
         return false;
     }
@@ -157,7 +153,7 @@ bool QtLockedFile::open(const OpenMode mode)
 */
 bool QtLockedFile::isLocked() const
 {
-    return m_lock_mode != NoLock;
+    return m_lockMode != NoLock;
 }
 
 /*!
@@ -168,7 +164,7 @@ bool QtLockedFile::isLocked() const
 */
 QtLockedFile::LockMode QtLockedFile::lockMode() const
 {
-    return m_lock_mode;
+    return m_lockMode;
 }
 
 /*!

src/app/qtlocalpeer/qtlockedfile.h

@@ -71,6 +71,7 @@
 #include <QFile>
 
 #ifdef Q_OS_WIN
+#include <QString>
 #include <QVector>
 #endif
 
@@ -100,14 +101,14 @@ namespace QtLP_Private
     private:
 #ifdef Q_OS_WIN
         Qt::HANDLE getMutexHandle(int idx, bool doCreate);
-        bool waitMutex(Qt::HANDLE mutex, bool doBlock);
+        bool waitMutex(Qt::HANDLE mutex, bool doBlock) const;
 
-        Qt::HANDLE wmutex = nullptr;
-        Qt::HANDLE rmutex = nullptr;
-        QVector<Qt::HANDLE> rmutexes;
-        QString mutexname;
+        Qt::HANDLE m_writeMutex = nullptr;
+        Qt::HANDLE m_readMutex = nullptr;
+        QVector<Qt::HANDLE> m_readMutexes;
+        QString m_mutexName;
 #endif
 
-        LockMode m_lock_mode;
+        LockMode m_lockMode = NoLock;
     };
 }

src/app/qtlocalpeer/qtlockedfile_unix.cpp

@@ -73,9 +73,10 @@
 #include <string.h>
 #include <unistd.h>
 
-bool QtLockedFile::lock(LockMode mode, bool block)
+bool QtLockedFile::lock(const LockMode mode, const bool block)
 {
-    if (!isOpen()) {
+    if (!isOpen())
+    {
         qWarning("QtLockedFile::lock(): file is not opened");
         return false;
     }
@@ -83,10 +84,10 @@ bool QtLockedFile::lock(LockMode mode, bool block)
     if (mode == NoLock)
         return unlock();
 
-    if (mode == m_lock_mode)
+    if (mode == m_lockMode)
         return true;
 
-    if (m_lock_mode != NoLock)
+    if (m_lockMode != NoLock)
         unlock();
 
     struct flock fl;
@@ -97,19 +98,21 @@ bool QtLockedFile::lock(LockMode mode, bool block)
     int cmd = block ? F_SETLKW : F_SETLK;
     int ret = fcntl(handle(), cmd, &fl);
 
-    if (ret == -1) {
+    if (ret == -1)
+    {
         if (errno != EINTR && errno != EAGAIN)
             qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
         return false;
     }
 
-    m_lock_mode = mode;
+    m_lockMode = mode;
     return true;
 }
 
 bool QtLockedFile::unlock()
 {
-    if (!isOpen()) {
+    if (!isOpen())
+    {
         qWarning("QtLockedFile::unlock(): file is not opened");
         return false;
     }
@@ -124,12 +127,13 @@ bool QtLockedFile::unlock()
     fl.l_type = F_UNLCK;
     int ret = fcntl(handle(), F_SETLKW, &fl);
 
-    if (ret == -1) {
+    if (ret == -1)
+    {
         qWarning("QtLockedFile::lock(): fcntl: %s", strerror(errno));
         return false;
     }
 
-    m_lock_mode = NoLock;
+    m_lockMode = NoLock;
     return true;
 }
 

src/app/qtlocalpeer/qtlockedfile_win.cpp

@@ -70,64 +70,73 @@
 
 #include <QFileInfo>
 
-#define MUTEX_PREFIX "QtLockedFile mutex "
+#include "base/global.h"
+
 // Maximum number of concurrent read locks. Must not be greater than MAXIMUM_WAIT_OBJECTS
-#define MAX_READERS MAXIMUM_WAIT_OBJECTS
+const int MAX_READERS = MAXIMUM_WAIT_OBJECTS;
 
-#define QT_WA(unicode, ansi) unicode
-
-Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
+Qt::HANDLE QtLockedFile::getMutexHandle(const int idx, const bool doCreate)
 {
-    if (mutexname.isEmpty()) {
+    if (m_mutexName.isEmpty())
+    {
         QFileInfo fi(*this);
-        mutexname = QString::fromLatin1(MUTEX_PREFIX)
-                    + fi.absoluteFilePath().toLower();
+        m_mutexName = QString::fromLatin1("QtLockedFile mutex ") + fi.absoluteFilePath().toLower();
     }
-    QString mname(mutexname);
+
+    QString mname = m_mutexName;
     if (idx >= 0)
         mname += QString::number(idx);
 
-    Qt::HANDLE mutex;
-    if (doCreate) {
-        QT_WA( { mutex = CreateMutexW(NULL, FALSE, (TCHAR*)mname.utf16()); },
-               { mutex = CreateMutexA(NULL, FALSE, mname.toLocal8Bit().constData()); } );
-        if (!mutex) {
+    if (doCreate)
+    {
+        const Qt::HANDLE mutex = ::CreateMutexW(NULL, FALSE, reinterpret_cast<const TCHAR *>(mname.utf16()));
+        if (!mutex)
+        {
             qErrnoWarning("QtLockedFile::lock(): CreateMutex failed");
-            return 0;
+            return nullptr;
         }
+
+        return mutex;
     }
-    else {
-        QT_WA( { mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (TCHAR*)mname.utf16()); },
-               { mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, mname.toLocal8Bit().constData()); } );
-        if (!mutex) {
+    else
+    {
+        const Qt::HANDLE mutex = ::OpenMutexW((SYNCHRONIZE | MUTEX_MODIFY_STATE), FALSE, reinterpret_cast<const TCHAR *>(mname.utf16()));
+        if (!mutex)
+        {
             if (GetLastError() != ERROR_FILE_NOT_FOUND)
                 qErrnoWarning("QtLockedFile::lock(): OpenMutex failed");
-            return 0;
-        }
+            return nullptr;
         }
+
         return mutex;
+    }
+
+    return nullptr;
 }
 
-bool QtLockedFile::waitMutex(Qt::HANDLE mutex, bool doBlock)
+bool QtLockedFile::waitMutex(const Qt::HANDLE mutex, const bool doBlock) const
 {
     Q_ASSERT(mutex);
-    DWORD res = WaitForSingleObject(mutex, doBlock ? INFINITE : 0);
-    switch (res) {
+
+    const DWORD res = ::WaitForSingleObject(mutex, (doBlock ? INFINITE : 0));
+    switch (res)
+    {
     case WAIT_OBJECT_0:
     case WAIT_ABANDONED:
         return true;
-        break;
     case WAIT_TIMEOUT:
-        break;
+        return false;
     default:
         qErrnoWarning("QtLockedFile::lock(): WaitForSingleObject failed");
+        break;
     }
     return false;
 }
 
-bool QtLockedFile::lock(LockMode mode, bool block)
+bool QtLockedFile::lock(const LockMode mode, const bool block)
 {
-    if (!isOpen()) {
+    if (!isOpen())
+    {
         qWarning("QtLockedFile::lock(): file is not opened");
         return false;
     }
@@ -135,72 +144,85 @@ bool QtLockedFile::lock(LockMode mode, bool block)
     if (mode == NoLock)
         return unlock();
 
-    if (mode == m_lock_mode)
+    if (mode == m_lockMode)
         return true;
 
-    if (m_lock_mode != NoLock)
+    if (m_lockMode != NoLock)
         unlock();
 
-    if (!wmutex && !(wmutex = getMutexHandle(-1, true)))
+    if (!m_writeMutex && !(m_writeMutex = getMutexHandle(-1, true)))
         return false;
 
-    if (!waitMutex(wmutex, block))
+    if (!waitMutex(m_writeMutex, block))
         return false;
 
-    if (mode == ReadLock) {
+    if (mode == ReadLock)
+    {
         int idx = 0;
-        for (; idx < MAX_READERS; idx++) {
-            rmutex = getMutexHandle(idx, false);
-            if (!rmutex || waitMutex(rmutex, false))
+        for (; idx < MAX_READERS; ++idx)
+        {
+            m_readMutex = getMutexHandle(idx, false);
+            if (!m_readMutex || waitMutex(m_readMutex, false))
                 break;
-            CloseHandle(rmutex);
+            ::CloseHandle(m_readMutex);
         }
+
         bool ok = true;
-        if (idx >= MAX_READERS) {
+        if (idx >= MAX_READERS)
+        {
             qWarning("QtLockedFile::lock(): too many readers");
-            rmutex = 0;
+            m_readMutex = nullptr;
             ok = false;
         }
-        else if (!rmutex) {
-            rmutex = getMutexHandle(idx, true);
-            if (!rmutex || !waitMutex(rmutex, false))
+        else if (!m_readMutex)
+        {
+            m_readMutex = getMutexHandle(idx, true);
+            if (!m_readMutex || !waitMutex(m_readMutex, false))
                 ok = false;
         }
-        if (!ok && rmutex) {
-            CloseHandle(rmutex);
-            rmutex = 0;
+
+        if (!ok && m_readMutex)
+        {
+            ::CloseHandle(m_readMutex);
+            m_readMutex = nullptr;
         }
-        ReleaseMutex(wmutex);
+
+        ::ReleaseMutex(m_writeMutex);
         if (!ok)
             return false;
     }
-    else {
-        Q_ASSERT(rmutexes.isEmpty());
-        for (int i = 0; i < MAX_READERS; i++) {
-            Qt::HANDLE mutex = getMutexHandle(i, false);
+    else
+    {
+        Q_ASSERT(m_readMutexes.isEmpty());
+        for (int i = 0; i < MAX_READERS; ++i)
+        {
+            const Qt::HANDLE mutex = getMutexHandle(i, false);
             if (mutex)
-                rmutexes.append(mutex);
+                m_readMutexes.append(mutex);
         }
-        if (rmutexes.size()) {
-            DWORD res = WaitForMultipleObjects(rmutexes.size(), rmutexes.constData(),
-                                               TRUE, block ? INFINITE : 0);
-            if (res != WAIT_OBJECT_0 && res != WAIT_ABANDONED) {
+        if (m_readMutexes.size())
+        {
+            const DWORD res = ::WaitForMultipleObjects(m_readMutexes.size(), m_readMutexes.constData(),
+                TRUE, (block ? INFINITE : 0));
+            if ((res != WAIT_OBJECT_0) && (res != WAIT_ABANDONED))
+            {
                 if (res != WAIT_TIMEOUT)
                     qErrnoWarning("QtLockedFile::lock(): WaitForMultipleObjects failed");
-                m_lock_mode = WriteLock;  // trick unlock() to clean up - semiyucky
+                m_lockMode = WriteLock;  // trick unlock() to clean up - semiyucky
                 unlock();
                 return false;
             }
         }
     }
 
-    m_lock_mode = mode;
+    m_lockMode = mode;
     return true;
 }
 
 bool QtLockedFile::unlock()
 {
-    if (!isOpen()) {
+    if (!isOpen())
+    {
         qWarning("QtLockedFile::unlock(): file is not opened");
         return false;
     }
@@ -208,21 +230,24 @@ bool QtLockedFile::unlock()
     if (!isLocked())
         return true;
 
-    if (m_lock_mode == ReadLock) {
-        ReleaseMutex(rmutex);
-        CloseHandle(rmutex);
-        rmutex = 0;
+    if (m_lockMode == ReadLock)
+    {
+        ::ReleaseMutex(m_readMutex);
+        ::CloseHandle(m_readMutex);
+        m_readMutex = nullptr;
     }
-    else {
-        foreach(Qt::HANDLE mutex, rmutexes) {
-            ReleaseMutex(mutex);
-            CloseHandle(mutex);
+    else
+    {
+        for (const Qt::HANDLE &mutex : asConst(m_readMutexes))
+        {
+            ::ReleaseMutex(mutex);
+            ::CloseHandle(mutex);
         }
-        rmutexes.clear();
-        ReleaseMutex(wmutex);
+        m_readMutexes.clear();
+        ::ReleaseMutex(m_writeMutex);
     }
 
-    m_lock_mode = QtLockedFile::NoLock;
+    m_lockMode = QtLockedFile::NoLock;
     return true;
 }
 
@@ -230,6 +255,6 @@ QtLockedFile::~QtLockedFile()
 {
     if (isOpen())
         unlock();
-    if (wmutex)
-        CloseHandle(wmutex);
+    if (m_writeMutex)
+        ::CloseHandle(m_writeMutex);
 }

src/app/stacktrace_win.h

@@ -73,7 +73,7 @@ void straceWin::loadHelpStackFrame(IMAGEHLP_STACK_FRAME& ihsf, const STACKFRAME6
 BOOL CALLBACK straceWin::EnumSymbolsCB(PSYMBOL_INFO symInfo, ULONG size, PVOID user)
 {
     Q_UNUSED(size)
-    QStringList* params = (QStringList*)user;
+    auto params = static_cast<QStringList *>(user);
     if (symInfo->Flags & SYMFLAG_PARAMETER)
         params->append(symInfo->Name);
     return TRUE;
@@ -91,7 +91,7 @@ BOOL CALLBACK straceWin::EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVO
 {
     Q_UNUSED(ModuleName)
     IMAGEHLP_MODULE64 mod;
-    EnumModulesContext* context = (EnumModulesContext*)UserContext;
+    auto context = static_cast<EnumModulesContext *>(UserContext);
     mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
     if(SymGetModuleInfo64(context->hProcess, BaseOfDll, &mod))
     {
@@ -264,7 +264,7 @@ const QString straceWin::getBacktrace()
     ULONG64 buffer[(sizeof(SYMBOL_INFO) +
                     MAX_SYM_NAME * sizeof(TCHAR) +
                     sizeof(ULONG64) - 1) /  sizeof(ULONG64)];
-    PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
+    auto pSymbol = reinterpret_cast<PSYMBOL_INFO>(buffer);
     pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
     pSymbol->MaxNameLen = MAX_SYM_NAME;
 

src/app/stacktracedialog.h

@@ -39,7 +39,7 @@ namespace Ui
 class StacktraceDialog : public QDialog
 {
     Q_OBJECT
-    Q_DISABLE_COPY(StacktraceDialog)
+    Q_DISABLE_COPY_MOVE(StacktraceDialog)
 
 public:
     explicit StacktraceDialog(QWidget *parent = nullptr);

src/app/upgrade.cpp

@@ -28,19 +28,24 @@
 
 #include "upgrade.h"
 
-#include <QFile>
 #include <QMetaEnum>
-#include <QVector>
 
 #include "base/bittorrent/torrentcontentlayout.h"
 #include "base/logger.h"
+#include "base/net/proxyconfigurationmanager.h"
+#include "base/preferences.h"
 #include "base/profile.h"
 #include "base/settingsstorage.h"
+#include "base/settingvalue.h"
 #include "base/utils/fs.h"
+#include "base/utils/io.h"
 #include "base/utils/string.h"
 
 namespace
 {
+    const int MIGRATION_VERSION = 3;
+    const char MIGRATION_VERSION_KEY[] = "Meta/MigrationVersion";
+
     void exportWebUIHttpsFiles()
     {
         const auto migrate = [](const QString &oldKey, const QString &newKey, const QString &savePath)
@@ -53,17 +58,10 @@ namespace
             if (!newData.isEmpty() || oldData.isEmpty())
                 return;
 
-            QFile file(savePath);
-            if (!file.open(QIODevice::WriteOnly))
+            const nonstd::expected<void, QString> result = Utils::IO::saveToFile(savePath, oldData);
+            if (!result)
             {
-                LogMsg(errorMsgFormat.arg(savePath, file.errorString()) , Log::WARNING);
-                return;
-            }
-            if (file.write(oldData) != oldData.size())
-            {
-                file.close();
-                Utils::Fs::forceRemove(savePath);
-                LogMsg(errorMsgFormat.arg(savePath, QLatin1String("Write incomplete.")) , Log::WARNING);
+                LogMsg(errorMsgFormat.arg(savePath, result.error()) , Log::WARNING);
                 return;
             }
 
@@ -77,10 +75,10 @@ namespace
         const QString configPath {specialFolderLocation(SpecialFolder::Config)};
         migrate(QLatin1String("Preferences/WebUI/HTTPS/Certificate")
             , QLatin1String("Preferences/WebUI/HTTPS/CertificatePath")
-            , Utils::Fs::toNativePath(configPath + QLatin1String("WebUICertificate.crt")));
+            , Utils::Fs::toNativePath(configPath + QLatin1String("/WebUICertificate.crt")));
         migrate(QLatin1String("Preferences/WebUI/HTTPS/Key")
             , QLatin1String("Preferences/WebUI/HTTPS/KeyPath")
-            , Utils::Fs::toNativePath(configPath + QLatin1String("WebUIPrivateKey.pem")));
+            , Utils::Fs::toNativePath(configPath + QLatin1String("/WebUIPrivateKey.pem")));
     }
 
     void upgradeTorrentContentLayout()
@@ -102,15 +100,308 @@ namespace
         settingsStorage->storeValue(newKey, Utils::String::fromEnum(torrentContentLayout));
         settingsStorage->removeValue(oldKey);
     }
+
+    void upgradeListenPortSettings()
+    {
+        const auto oldKey = QString::fromLatin1("BitTorrent/Session/UseRandomPort");
+        const auto newKey = QString::fromLatin1("Preferences/Connection/PortRangeMin");
+        auto *settingsStorage = SettingsStorage::instance();
+
+        if (settingsStorage->hasKey(oldKey))
+        {
+            if (settingsStorage->loadValue<bool>(oldKey))
+                settingsStorage->storeValue(newKey, 0);
+
+            settingsStorage->removeValue(oldKey);
+        }
+    }
+
+    void upgradeSchedulerDaysSettings()
+    {
+        auto *settingsStorage = SettingsStorage::instance();
+        const auto key = QString::fromLatin1("Preferences/Scheduler/days");
+        const auto value = settingsStorage->loadValue<QString>(key);
+
+        bool ok = false;
+        const auto number = value.toInt(&ok);
+
+        if (ok)
+        {
+            switch (number)
+            {
+            case 0:
+                settingsStorage->storeValue(key, Scheduler::Days::EveryDay);
+                break;
+            case 1:
+                settingsStorage->storeValue(key, Scheduler::Days::Weekday);
+                break;
+            case 2:
+                settingsStorage->storeValue(key, Scheduler::Days::Weekend);
+                break;
+            case 3:
+                settingsStorage->storeValue(key, Scheduler::Days::Monday);
+                break;
+            case 4:
+                settingsStorage->storeValue(key, Scheduler::Days::Tuesday);
+                break;
+            case 5:
+                settingsStorage->storeValue(key, Scheduler::Days::Wednesday);
+                break;
+            case 6:
+                settingsStorage->storeValue(key, Scheduler::Days::Thursday);
+                break;
+            case 7:
+                settingsStorage->storeValue(key, Scheduler::Days::Friday);
+                break;
+            case 8:
+                settingsStorage->storeValue(key, Scheduler::Days::Saturday);
+                break;
+            case 9:
+                settingsStorage->storeValue(key, Scheduler::Days::Sunday);
+                break;
+            default:
+                LogMsg(QObject::tr("Invalid value found in configuration file, reverting it to default. Key: \"%1\". Invalid value: \"%2\".")
+                    .arg(key, QString::number(number)), Log::WARNING);
+                settingsStorage->removeValue(key);
+                break;
+            }
+        }
+    }
+
+    void upgradeDNSServiceSettings()
+    {
+        auto *settingsStorage = SettingsStorage::instance();
+        const auto key = QString::fromLatin1("Preferences/DynDNS/Service");
+        const auto value = settingsStorage->loadValue<QString>(key);
+
+        bool ok = false;
+        const auto number = value.toInt(&ok);
+
+        if (ok)
+        {
+            switch (number)
+            {
+            case -1:
+                settingsStorage->storeValue(key, DNS::Service::None);
+                break;
+            case 0:
+                settingsStorage->storeValue(key, DNS::Service::DynDNS);
+                break;
+            case 1:
+                settingsStorage->storeValue(key, DNS::Service::NoIP);
+                break;
+            default:
+                LogMsg(QObject::tr("Invalid value found in configuration file, reverting it to default. Key: \"%1\". Invalid value: \"%2\".")
+                    .arg(key, QString::number(number)), Log::WARNING);
+                settingsStorage->removeValue(key);
+                break;
+            }
+        }
+    }
+
+    void upgradeTrayIconStyleSettings()
+    {
+        auto *settingsStorage = SettingsStorage::instance();
+        const auto key = QString::fromLatin1("Preferences/Advanced/TrayIconStyle");
+        const auto value = settingsStorage->loadValue<QString>(key);
+
+        bool ok = false;
+        const auto number = value.toInt(&ok);
+
+        if (ok)
+        {
+            switch (number)
+            {
+            case 0:
+                settingsStorage->storeValue(key, TrayIcon::Style::Normal);
+                break;
+            case 1:
+                settingsStorage->storeValue(key, TrayIcon::Style::MonoDark);
+                break;
+            case 2:
+                settingsStorage->storeValue(key, TrayIcon::Style::MonoLight);
+                break;
+            default:
+                LogMsg(QObject::tr("Invalid value found in configuration file, reverting it to default. Key: \"%1\". Invalid value: \"%2\".")
+                    .arg(key, QString::number(number)), Log::WARNING);
+                settingsStorage->removeValue(key);
+                break;
+            }
+        }
+    }
+
+    void migrateSettingKeys()
+    {
+        struct KeyMapping
+        {
+            QString newKey;
+            QString oldKey;
+        };
+
+        const KeyMapping mappings[] =
+        {
+            {"AddNewTorrentDialog/Enabled", "Preferences/Downloads/NewAdditionDialog"},
+            {"AddNewTorrentDialog/Expanded", "AddNewTorrentDialog/expanded"},
+            {"AddNewTorrentDialog/Position", "AddNewTorrentDialog/y"},
+            {"AddNewTorrentDialog/SavePathHistory", "TorrentAdditionDlg/save_path_history"},
+            {"AddNewTorrentDialog/TopLevel", "Preferences/Downloads/NewAdditionDialogFront"},
+            {"AddNewTorrentDialog/TreeHeaderState", "AddNewTorrentDialog/qt5/treeHeaderState"},
+            {"AddNewTorrentDialog/Width", "AddNewTorrentDialog/width"},
+            {"BitTorrent/Session/AddExtensionToIncompleteFiles", "Preferences/Downloads/UseIncompleteExtension"},
+            {"BitTorrent/Session/AdditionalTrackers", "Preferences/Bittorrent/TrackersList"},
+            {"BitTorrent/Session/AddTorrentPaused", "Preferences/Downloads/StartInPause"},
+            {"BitTorrent/Session/AddTrackersEnabled", "Preferences/Bittorrent/AddTrackers"},
+            {"BitTorrent/Session/AlternativeGlobalDLSpeedLimit", "Preferences/Connection/GlobalDLLimitAlt"},
+            {"BitTorrent/Session/AlternativeGlobalUPSpeedLimit", "Preferences/Connection/GlobalUPLimitAlt"},
+            {"BitTorrent/Session/AnnounceIP", "Preferences/Connection/InetAddress"},
+            {"BitTorrent/Session/AnnounceToAllTrackers", "Preferences/Advanced/AnnounceToAllTrackers"},
+            {"BitTorrent/Session/AnonymousModeEnabled", "Preferences/Advanced/AnonymousMode"},
+            {"BitTorrent/Session/BandwidthSchedulerEnabled", "Preferences/Scheduler/Enabled"},
+            {"BitTorrent/Session/DefaultSavePath", "Preferences/Downloads/SavePath"},
+            {"BitTorrent/Session/DHTEnabled", "Preferences/Bittorrent/DHT"},
+            {"BitTorrent/Session/DiskCacheSize", "Preferences/Downloads/DiskWriteCacheSize"},
+            {"BitTorrent/Session/DiskCacheTTL", "Preferences/Downloads/DiskWriteCacheTTL"},
+            {"BitTorrent/Session/Encryption", "Preferences/Bittorrent/Encryption"},
+            {"BitTorrent/Session/FinishedTorrentExportDirectory", "Preferences/Downloads/FinishedTorrentExportDir"},
+            {"BitTorrent/Session/ForceProxy", "Preferences/Connection/ProxyForce"},
+            {"BitTorrent/Session/GlobalDLSpeedLimit", "Preferences/Connection/GlobalDLLimit"},
+            {"BitTorrent/Session/GlobalMaxRatio", "Preferences/Bittorrent/MaxRatio"},
+            {"BitTorrent/Session/GlobalUPSpeedLimit", "Preferences/Connection/GlobalUPLimit"},
+            {"BitTorrent/Session/IgnoreLimitsOnLAN", "Preferences/Advanced/IgnoreLimitsLAN"},
+            {"BitTorrent/Session/IgnoreSlowTorrentsForQueueing", "Preferences/Queueing/IgnoreSlowTorrents"},
+            {"BitTorrent/Session/IncludeOverheadInLimits", "Preferences/Advanced/IncludeOverhead"},
+            {"BitTorrent/Session/Interface", "Preferences/Connection/Interface"},
+            {"BitTorrent/Session/InterfaceAddress", "Preferences/Connection/InterfaceAddress"},
+            {"BitTorrent/Session/InterfaceName", "Preferences/Connection/InterfaceName"},
+            {"BitTorrent/Session/IPFilter", "Preferences/IPFilter/File"},
+            {"BitTorrent/Session/IPFilteringEnabled", "Preferences/IPFilter/Enabled"},
+            {"BitTorrent/Session/LSDEnabled", "Preferences/Bittorrent/LSD"},
+            {"BitTorrent/Session/MaxActiveDownloads", "Preferences/Queueing/MaxActiveDownloads"},
+            {"BitTorrent/Session/MaxActiveTorrents", "Preferences/Queueing/MaxActiveTorrents"},
+            {"BitTorrent/Session/MaxActiveUploads", "Preferences/Queueing/MaxActiveUploads"},
+            {"BitTorrent/Session/MaxConnections", "Preferences/Bittorrent/MaxConnecs"},
+            {"BitTorrent/Session/MaxConnectionsPerTorrent", "Preferences/Bittorrent/MaxConnecsPerTorrent"},
+            {"BitTorrent/Session/MaxHalfOpenConnections", "Preferences/Connection/MaxHalfOpenConnec"},
+            {"BitTorrent/Session/MaxRatioAction", "Preferences/Bittorrent/MaxRatioAction"},
+            {"BitTorrent/Session/MaxUploads", "Preferences/Bittorrent/MaxUploads"},
+            {"BitTorrent/Session/MaxUploadsPerTorrent", "Preferences/Bittorrent/MaxUploadsPerTorrent"},
+            {"BitTorrent/Session/OutgoingPortsMax", "Preferences/Advanced/OutgoingPortsMax"},
+            {"BitTorrent/Session/OutgoingPortsMin", "Preferences/Advanced/OutgoingPortsMin"},
+            {"BitTorrent/Session/PeXEnabled", "Preferences/Bittorrent/PeX"},
+            {"BitTorrent/Session/Port", "Preferences/Connection/PortRangeMin"},
+            {"BitTorrent/Session/Preallocation", "Preferences/Downloads/PreAllocation"},
+            {"BitTorrent/Session/ProxyPeerConnections", "Preferences/Connection/ProxyPeerConnections"},
+            {"BitTorrent/Session/QueueingSystemEnabled", "Preferences/Queueing/QueueingEnabled"},
+            {"BitTorrent/Session/RefreshInterval", "Preferences/General/RefreshInterval"},
+            {"BitTorrent/Session/SaveResumeDataInterval", "Preferences/Downloads/SaveResumeDataInterval"},
+            {"BitTorrent/Session/SuperSeedingEnabled", "Preferences/Advanced/SuperSeeding"},
+            {"BitTorrent/Session/TempPath", "Preferences/Downloads/TempPath"},
+            {"BitTorrent/Session/TempPathEnabled", "Preferences/Downloads/TempPathEnabled"},
+            {"BitTorrent/Session/TorrentExportDirectory", "Preferences/Downloads/TorrentExportDir"},
+            {"BitTorrent/Session/TrackerFilteringEnabled", "Preferences/IPFilter/FilterTracker"},
+            {"BitTorrent/Session/UseAlternativeGlobalSpeedLimit", "Preferences/Connection/alt_speeds_on"},
+            {"BitTorrent/Session/UseOSCache", "Preferences/Advanced/osCache"},
+            {"BitTorrent/Session/UseRandomPort", "Preferences/General/UseRandomPort"},
+            {"BitTorrent/Session/uTPEnabled", "Preferences/Bittorrent/uTP"},
+            {"BitTorrent/Session/uTPRateLimited", "Preferences/Bittorrent/uTP_rate_limited"},
+            {"BitTorrent/TrackerEnabled", "Preferences/Advanced/trackerEnabled"},
+            {"Network/PortForwardingEnabled", "Preferences/Connection/UPnP"},
+            {"Network/Proxy/Authentication", "Preferences/Connection/Proxy/Authentication"},
+            {"Network/Proxy/IP", "Preferences/Connection/Proxy/IP"},
+            {"Network/Proxy/OnlyForTorrents", "Preferences/Connection/ProxyOnlyForTorrents"},
+            {"Network/Proxy/Password", "Preferences/Connection/Proxy/Password"},
+            {"Network/Proxy/Port", "Preferences/Connection/Proxy/Port"},
+            {"Network/Proxy/Type", "Preferences/Connection/ProxyType"},
+            {"Network/Proxy/Username", "Preferences/Connection/Proxy/Username"},
+            {"State/BannedIPs", "Preferences/IPFilter/BannedIPs"}
+        };
+
+        auto *settingsStorage = SettingsStorage::instance();
+        for (const KeyMapping &mapping : mappings)
+        {
+            if (settingsStorage->hasKey(mapping.oldKey))
+            {
+                const auto value = settingsStorage->loadValue<QVariant>(mapping.oldKey);
+                settingsStorage->storeValue(mapping.newKey, value);
+                // TODO: Remove oldKey after ~v4.4.3 and bump migration version
+            }
+        }
+    }
+
+    void migrateProxySettingsEnum()
+    {
+        auto *settingsStorage = SettingsStorage::instance();
+        const auto key = QString::fromLatin1("Network/Proxy/Type");
+        const auto value = settingsStorage->loadValue<QString>(key);
+
+        bool ok = false;
+        const auto number = value.toInt(&ok);
+
+        if (ok)
+        {
+            switch (number)
+            {
+            case 0:
+                settingsStorage->storeValue(key, Net::ProxyType::None);
+                break;
+            case 1:
+                settingsStorage->storeValue(key, Net::ProxyType::HTTP);
+                break;
+            case 2:
+                settingsStorage->storeValue(key, Net::ProxyType::SOCKS5);
+                break;
+            case 3:
+                settingsStorage->storeValue(key, Net::ProxyType::HTTP_PW);
+                break;
+            case 4:
+                settingsStorage->storeValue(key, Net::ProxyType::SOCKS5_PW);
+                break;
+            case 5:
+                settingsStorage->storeValue(key, Net::ProxyType::SOCKS4);
+                break;
+            default:
+                LogMsg(QObject::tr("Invalid value found in configuration file, reverting it to default. Key: \"%1\". Invalid value: \"%2\".")
+                           .arg(key, QString::number(number)), Log::WARNING);
+                settingsStorage->removeValue(key);
+                break;
+            }
+        }
+    }
 }
 
 bool upgrade(const bool /*ask*/)
 {
+    CachedSettingValue<int> version {MIGRATION_VERSION_KEY, 0};
+
+    if (version != MIGRATION_VERSION)
+    {
+        if (version < 1)
+        {
             exportWebUIHttpsFiles();
             upgradeTorrentContentLayout();
+            upgradeListenPortSettings();
+            upgradeSchedulerDaysSettings();
+            upgradeDNSServiceSettings();
+            upgradeTrayIconStyleSettings();
+        }
+
+        if (version < 2)
+            migrateSettingKeys();
+
+        if (version < 3)
+            migrateProxySettingsEnum();
+
+        version = MIGRATION_VERSION;
+    }
+
     return true;
 }
 
+void setCurrentMigrationVersion()
+{
+    SettingsStorage::instance()->storeValue(QLatin1String(MIGRATION_VERSION_KEY), MIGRATION_VERSION);
+}
+
 void handleChangedDefaults(const DefaultPreferencesMode mode)
 {
     struct DefaultValue
@@ -120,15 +411,18 @@ void handleChangedDefaults(const DefaultPreferencesMode mode)
         QVariant current;
     };
 
-    const QVector<DefaultValue> changedDefaults
+    const DefaultValue changedDefaults[] =
     {
         {QLatin1String {"BitTorrent/Session/QueueingSystemEnabled"}, true, false}
     };
 
-    SettingsStorage *settingsStorage {SettingsStorage::instance()};
-    for (auto it = changedDefaults.cbegin(); it != changedDefaults.cend(); ++it)
+    auto *settingsStorage = SettingsStorage::instance();
+    for (const DefaultValue &value : changedDefaults)
     {
-        if (settingsStorage->loadValue<QVariant>(it->name).isNull())
-            settingsStorage->storeValue(it->name, (mode == DefaultPreferencesMode::Legacy ? it->legacy : it->current));
+        if (!settingsStorage->hasKey(value.name))
+        {
+            settingsStorage->storeValue(value.name
+                , (mode == DefaultPreferencesMode::Legacy ? value.legacy : value.current));
+        }
     }
 }

src/app/upgrade.h

@@ -36,3 +36,4 @@ enum class DefaultPreferencesMode
 
 void handleChangedDefaults(DefaultPreferencesMode mode);
 bool upgrade(bool ask = true);
+void setCurrentMigrationVersion();

src/base/CMakeLists.txt

@@ -1,26 +1,31 @@
 add_library(qbt_base STATIC
     # headers
+    3rdparty/expected.hpp
     algorithm.h
     asyncfilestorage.h
     bittorrent/abstractfilestorage.h
     bittorrent/addtorrentparams.h
     bittorrent/bandwidthscheduler.h
+    bittorrent/bencoderesumedatastorage.h
     bittorrent/cachestatus.h
+    bittorrent/categoryoptions.h
     bittorrent/common.h
     bittorrent/customstorage.h
+    bittorrent/dbresumedatastorage.h
     bittorrent/downloadpriority.h
     bittorrent/filesearcher.h
     bittorrent/filterparserthread.h
     bittorrent/infohash.h
+    bittorrent/loadtorrentparams.h
     bittorrent/ltqhash.h
-    bittorrent/ltunderlyingtype.h
+    bittorrent/lttypecast.h
     bittorrent/magneturi.h
     bittorrent/nativesessionextension.h
     bittorrent/nativetorrentextension.h
     bittorrent/peeraddress.h
     bittorrent/peerinfo.h
     bittorrent/portforwarderimpl.h
-    bittorrent/resumedatasavingmanager.h
+    bittorrent/resumedatastorage.h
     bittorrent/session.h
     bittorrent/sessionstatus.h
     bittorrent/speedmonitor.h
@@ -55,6 +60,7 @@ add_library(qbt_base STATIC
     net/proxyconfigurationmanager.h
     net/reverseresolution.h
     net/smtp.h
+    orderedset.h
     preferences.h
     profile.h
     profile_p.h
@@ -70,12 +76,14 @@ add_library(qbt_base STATIC
     search/searchhandler.h
     search/searchpluginmanager.h
     settingsstorage.h
+    tagset.h
     torrentfileguard.h
     torrentfileswatcher.h
     torrentfilter.h
     types.h
     unicodestrings.h
     utils/bytearray.h
+    utils/compare.h
     utils/foreignapps.h
     utils/fs.h
     utils/gzip.h
@@ -92,7 +100,10 @@ add_library(qbt_base STATIC
     asyncfilestorage.cpp
     bittorrent/abstractfilestorage.cpp
     bittorrent/bandwidthscheduler.cpp
+    bittorrent/bencoderesumedatastorage.cpp
+    bittorrent/categoryoptions.cpp
     bittorrent/customstorage.cpp
+    bittorrent/dbresumedatastorage.cpp
     bittorrent/downloadpriority.cpp
     bittorrent/filesearcher.cpp
     bittorrent/filterparserthread.cpp
@@ -103,11 +114,11 @@ add_library(qbt_base STATIC
     bittorrent/peeraddress.cpp
     bittorrent/peerinfo.cpp
     bittorrent/portforwarderimpl.cpp
-    bittorrent/resumedatasavingmanager.cpp
     bittorrent/session.cpp
     bittorrent/speedmonitor.cpp
     bittorrent/statistics.cpp
     bittorrent/torrent.cpp
+    bittorrent/torrentcontentlayout.cpp
     bittorrent/torrentcreatorthread.cpp
     bittorrent/torrentimpl.cpp
     bittorrent/torrentinfo.cpp
@@ -146,10 +157,12 @@ add_library(qbt_base STATIC
     search/searchhandler.cpp
     search/searchpluginmanager.cpp
     settingsstorage.cpp
+    tagset.cpp
     torrentfileguard.cpp
     torrentfileswatcher.cpp
     torrentfilter.cpp
     utils/bytearray.cpp
+    utils/compare.cpp
     utils/foreignapps.cpp
     utils/fs.cpp
     utils/gzip.cpp
@@ -167,7 +180,7 @@ target_link_libraries(qbt_base
         ZLIB::ZLIB
     PUBLIC
         LibtorrentRasterbar::torrent-rasterbar
-        Qt5::Core Qt5::Network Qt5::Xml
+        Qt::Core Qt::Network Qt::Sql Qt::Xml
         qbt_common_cfg
 )
 
@@ -194,5 +207,5 @@ if (NOT WEBUI)
 endif()
 
 if (DBUS)
-    target_link_libraries(qbt_base PUBLIC Qt5::DBus)
+    target_link_libraries(qbt_base PUBLIC Qt::DBus)
 endif()

src/base/algorithm.h

@@ -44,7 +44,7 @@ namespace Algorithm
     {
     };
 
-    // To be used with associative array types, such as QMap, QHash and it's variants
+    // To be used with associative array types, such as QMap, QHash and its variants
     template <typename T, typename BinaryPredicate
         , typename std::enable_if_t<HasMappedType<T>::value, int> = 0>
     void removeIf(T &dict, BinaryPredicate &&p)

src/base/asyncfilestorage.cpp

@@ -30,7 +30,8 @@
 
 #include <QDebug>
 #include <QMetaObject>
-#include <QSaveFile>
+
+#include "base/utils/io.h"
 
 AsyncFileStorage::AsyncFileStorage(const QString &storageFolderPath, QObject *parent)
     : QObject(parent)
@@ -67,15 +68,12 @@ QDir AsyncFileStorage::storageDir() const
 void AsyncFileStorage::store_impl(const QString &fileName, const QByteArray &data)
 {
     const QString filePath = m_storageDir.absoluteFilePath(fileName);
-    QSaveFile file(filePath);
     qDebug() << "AsyncFileStorage: Saving data to" << filePath;
-    if (file.open(QIODevice::WriteOnly))
-    {
-        file.write(data);
-        if (!file.commit())
+
+    const nonstd::expected<void, QString> result = Utils::IO::saveToFile(filePath, data);
+    if (!result)
     {
         qDebug() << "AsyncFileStorage: Failed to save data";
-            emit failed(filePath, file.errorString());
-        }
+        emit failed(filePath, result.error());
     }
 }

src/base/asyncfilestorage.h

@@ -43,7 +43,7 @@ public:
 class AsyncFileStorage : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(AsyncFileStorage)
+    Q_DISABLE_COPY_MOVE(AsyncFileStorage)
 
 public:
     explicit AsyncFileStorage(const QString &storageFolderPath, QObject *parent = nullptr);

src/base/base.pri

@@ -1,25 +1,30 @@
 HEADERS += \
+    $$PWD/3rdparty/expected.hpp \
     $$PWD/algorithm.h \
     $$PWD/asyncfilestorage.h \
     $$PWD/bittorrent/abstractfilestorage.h \
     $$PWD/bittorrent/addtorrentparams.h \
     $$PWD/bittorrent/bandwidthscheduler.h \
+    $$PWD/bittorrent/bencoderesumedatastorage.h \
     $$PWD/bittorrent/cachestatus.h \
+    $$PWD/bittorrent/categoryoptions.h \
     $$PWD/bittorrent/common.h \
     $$PWD/bittorrent/customstorage.h \
     $$PWD/bittorrent/downloadpriority.h \
+    $$PWD/bittorrent/dbresumedatastorage.h \
     $$PWD/bittorrent/filesearcher.h \
     $$PWD/bittorrent/filterparserthread.h \
     $$PWD/bittorrent/infohash.h \
+    $$PWD/bittorrent/loadtorrentparams.h \
     $$PWD/bittorrent/ltqhash.h \
-    $$PWD/bittorrent/ltunderlyingtype.h \
+    $$PWD/bittorrent/lttypecast.h \
     $$PWD/bittorrent/magneturi.h \
     $$PWD/bittorrent/nativesessionextension.h \
     $$PWD/bittorrent/nativetorrentextension.h \
     $$PWD/bittorrent/peeraddress.h \
     $$PWD/bittorrent/peerinfo.h \
     $$PWD/bittorrent/portforwarderimpl.h \
-    $$PWD/bittorrent/resumedatasavingmanager.h \
+    $$PWD/bittorrent/resumedatastorage.h \
     $$PWD/bittorrent/session.h \
     $$PWD/bittorrent/sessionstatus.h \
     $$PWD/bittorrent/speedmonitor.h \
@@ -54,6 +59,7 @@ HEADERS += \
     $$PWD/net/proxyconfigurationmanager.h \
     $$PWD/net/reverseresolution.h \
     $$PWD/net/smtp.h \
+    $$PWD/orderedset.h \
     $$PWD/preferences.h \
     $$PWD/profile.h \
     $$PWD/profile_p.h \
@@ -70,12 +76,14 @@ HEADERS += \
     $$PWD/search/searchpluginmanager.h \
     $$PWD/settingsstorage.h \
     $$PWD/settingvalue.h \
+    $$PWD/tagset.h \
     $$PWD/torrentfileguard.h \
     $$PWD/torrentfileswatcher.h \
     $$PWD/torrentfilter.h \
     $$PWD/types.h \
     $$PWD/unicodestrings.h \
     $$PWD/utils/bytearray.h \
+    $$PWD/utils/compare.h \
     $$PWD/utils/foreignapps.h \
     $$PWD/utils/fs.h \
     $$PWD/utils/gzip.h \
@@ -92,7 +100,10 @@ SOURCES += \
     $$PWD/asyncfilestorage.cpp \
     $$PWD/bittorrent/abstractfilestorage.cpp \
     $$PWD/bittorrent/bandwidthscheduler.cpp \
+    $$PWD/bittorrent/bencoderesumedatastorage.cpp \
+    $$PWD/bittorrent/categoryoptions.cpp \
     $$PWD/bittorrent/customstorage.cpp \
+    $$PWD/bittorrent/dbresumedatastorage.cpp \
     $$PWD/bittorrent/downloadpriority.cpp \
     $$PWD/bittorrent/filesearcher.cpp \
     $$PWD/bittorrent/filterparserthread.cpp \
@@ -103,11 +114,11 @@ SOURCES += \
     $$PWD/bittorrent/peeraddress.cpp \
     $$PWD/bittorrent/peerinfo.cpp \
     $$PWD/bittorrent/portforwarderimpl.cpp \
-    $$PWD/bittorrent/resumedatasavingmanager.cpp \
     $$PWD/bittorrent/session.cpp \
     $$PWD/bittorrent/speedmonitor.cpp \
     $$PWD/bittorrent/statistics.cpp \
     $$PWD/bittorrent/torrent.cpp \
+    $$PWD/bittorrent/torrentcontentlayout.cpp \
     $$PWD/bittorrent/torrentcreatorthread.cpp \
     $$PWD/bittorrent/torrentimpl.cpp \
     $$PWD/bittorrent/torrentinfo.cpp \
@@ -146,10 +157,12 @@ SOURCES += \
     $$PWD/search/searchhandler.cpp \
     $$PWD/search/searchpluginmanager.cpp \
     $$PWD/settingsstorage.cpp \
+    $$PWD/tagset.cpp \
     $$PWD/torrentfileguard.cpp \
     $$PWD/torrentfileswatcher.cpp \
     $$PWD/torrentfilter.cpp \
     $$PWD/utils/bytearray.cpp \
+    $$PWD/utils/compare.cpp \
     $$PWD/utils/foreignapps.cpp \
     $$PWD/utils/fs.cpp \
     $$PWD/utils/gzip.cpp \

src/base/bittorrent/abstractfilestorage.h

@@ -44,7 +44,6 @@ namespace BitTorrent
 
         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;

src/base/bittorrent/addtorrentparams.h

@@ -31,10 +31,10 @@
 #include <optional>
 
 #include <QMetaType>
-#include <QSet>
 #include <QString>
 #include <QVector>
 
+#include "base/tagset.h"
 #include "torrent.h"
 #include "torrentcontentlayout.h"
 
@@ -46,13 +46,15 @@ namespace BitTorrent
     {
         QString name;
         QString category;
-        QSet<QString> tags;
+        TagSet tags;
         QString savePath;
-        bool disableTempPath = false; // e.g. for imported torrents
+        std::optional<bool> useDownloadPath;
+        QString downloadPath;
         bool sequential = false;
         bool firstLastPiecePriority = false;
         bool addForced = false;
         std::optional<bool> addPaused;
+        QStringList filePaths; // used if TorrentInfo is set
         QVector<DownloadPriority> filePriorities; // used if TorrentInfo is set
         bool skipChecking = false;
         std::optional<BitTorrent::TorrentContentLayout> contentLayout;

src/base/bittorrent/bandwidthscheduler.cpp

@@ -61,7 +61,7 @@ bool BandwidthScheduler::isTimeForAlternative() const
     QTime start = pref->getSchedulerStartTime();
     QTime end = pref->getSchedulerEndTime();
     const QTime now = QTime::currentTime();
-    const int schedulerDays = pref->getSchedulerDays();
+    const Scheduler::Days schedulerDays = pref->getSchedulerDays();
     const int day = QDate::currentDate().dayOfWeek();
     bool alternative = false;
 
@@ -75,20 +75,34 @@ bool BandwidthScheduler::isTimeForAlternative() const
     {
         switch (schedulerDays)
         {
-        case EVERY_DAY:
+        case Scheduler::Days::EveryDay:
             alternative = !alternative;
             break;
-        case WEEK_ENDS:
+        case Scheduler::Days::Monday:
+        case Scheduler::Days::Tuesday:
+        case Scheduler::Days::Wednesday:
+        case Scheduler::Days::Thursday:
+        case Scheduler::Days::Friday:
+        case Scheduler::Days::Saturday:
+        case Scheduler::Days::Sunday:
+            {
+                const int offset = static_cast<int>(Scheduler::Days::Monday) - 1;
+                const int dayOfWeek = static_cast<int>(schedulerDays) - offset;
+                if (day == dayOfWeek)
+                    alternative = !alternative;
+            }
+            break;
+        case Scheduler::Days::Weekday:
+            if ((day >= 1) && (day <= 5))
+                alternative = !alternative;
+            break;
+        case Scheduler::Days::Weekend:
             if ((day == 6) || (day == 7))
                 alternative = !alternative;
             break;
-        case WEEK_DAYS:
-            if ((day != 6) && (day != 7))
-                alternative = !alternative;
-            break;
         default:
-            if (day == (schedulerDays - 2))
-                alternative = !alternative;
+            Q_ASSERT(false);
+            break;
         }
     }
 

src/base/bittorrent/bandwidthscheduler.h

@@ -35,7 +35,7 @@
 class BandwidthScheduler : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(BandwidthScheduler)
+    Q_DISABLE_COPY_MOVE(BandwidthScheduler)
 
 public:
     explicit BandwidthScheduler(QObject *parent = nullptr);

src/base/bittorrent/bencoderesumedatastorage.cpp

@@ -0,0 +1,409 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#include "bencoderesumedatastorage.h"
+
+#include <libtorrent/bdecode.hpp>
+#include <libtorrent/entry.hpp>
+#include <libtorrent/read_resume_data.hpp>
+#include <libtorrent/torrent_info.hpp>
+#include <libtorrent/write_resume_data.hpp>
+
+#include <QByteArray>
+#include <QDebug>
+#include <QRegularExpression>
+#include <QThread>
+
+#include "base/algorithm.h"
+#include "base/exceptions.h"
+#include "base/global.h"
+#include "base/logger.h"
+#include "base/profile.h"
+#include "base/tagset.h"
+#include "base/utils/fs.h"
+#include "base/utils/io.h"
+#include "base/utils/string.h"
+#include "infohash.h"
+#include "loadtorrentparams.h"
+
+namespace BitTorrent
+{
+    class BencodeResumeDataStorage::Worker final : public QObject
+    {
+        Q_DISABLE_COPY_MOVE(Worker)
+
+    public:
+        explicit Worker(const QDir &resumeDataDir);
+
+        void store(const TorrentID &id, const LoadTorrentParams &resumeData) const;
+        void remove(const TorrentID &id) const;
+        void storeQueue(const QVector<TorrentID> &queue) const;
+
+    private:
+        const QDir m_resumeDataDir;
+    };
+}
+
+namespace
+{
+    template <typename LTStr>
+    QString fromLTString(const LTStr &str)
+    {
+        return QString::fromUtf8(str.data(), static_cast<int>(str.size()));
+    }
+
+    using ListType = lt::entry::list_type;
+
+    ListType setToEntryList(const TagSet &input)
+    {
+        ListType entryList;
+        entryList.reserve(input.size());
+        for (const QString &setValue : input)
+            entryList.emplace_back(setValue.toStdString());
+        return entryList;
+    }
+}
+
+BitTorrent::BencodeResumeDataStorage::BencodeResumeDataStorage(const QString &path, QObject *parent)
+    : ResumeDataStorage {parent}
+    , m_resumeDataDir {path}
+    , m_ioThread {new QThread {this}}
+    , m_asyncWorker {new Worker {m_resumeDataDir}}
+{
+    if (!m_resumeDataDir.exists() && !m_resumeDataDir.mkpath(m_resumeDataDir.absolutePath()))
+    {
+        throw RuntimeError {tr("Cannot create torrent resume folder: \"%1\"")
+                    .arg(Utils::Fs::toNativePath(m_resumeDataDir.absolutePath()))};
+    }
+
+    const QRegularExpression filenamePattern {QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$")};
+    const QStringList filenames = m_resumeDataDir.entryList(QStringList(QLatin1String("*.fastresume")), QDir::Files, QDir::Unsorted);
+
+    m_registeredTorrents.reserve(filenames.size());
+    for (const QString &filename : filenames)
+    {
+         const QRegularExpressionMatch rxMatch = filenamePattern.match(filename);
+         if (rxMatch.hasMatch())
+             m_registeredTorrents.append(TorrentID::fromString(rxMatch.captured(1)));
+    }
+
+    loadQueue(m_resumeDataDir.absoluteFilePath(QLatin1String("queue")));
+
+    qDebug() << "Registered torrents count: " << m_registeredTorrents.size();
+
+    m_asyncWorker->moveToThread(m_ioThread);
+    connect(m_ioThread, &QThread::finished, m_asyncWorker, &QObject::deleteLater);
+    m_ioThread->start();
+}
+
+BitTorrent::BencodeResumeDataStorage::~BencodeResumeDataStorage()
+{
+    m_ioThread->quit();
+    m_ioThread->wait();
+}
+
+QVector<BitTorrent::TorrentID> BitTorrent::BencodeResumeDataStorage::registeredTorrents() const
+{
+    return m_registeredTorrents;
+}
+
+std::optional<BitTorrent::LoadTorrentParams> BitTorrent::BencodeResumeDataStorage::load(const TorrentID &id) const
+{
+    const QString idString = id.toString();
+    const QString fastresumePath = m_resumeDataDir.absoluteFilePath(QString::fromLatin1("%1.fastresume").arg(idString));
+    const QString torrentFilePath = m_resumeDataDir.absoluteFilePath(QString::fromLatin1("%1.torrent").arg(idString));
+
+    QFile resumeDataFile {fastresumePath};
+    if (!resumeDataFile.open(QIODevice::ReadOnly))
+    {
+        LogMsg(tr("Cannot read file %1: %2").arg(fastresumePath, resumeDataFile.errorString()), Log::WARNING);
+        return std::nullopt;
+    }
+
+    QFile metadataFile {torrentFilePath};
+    if (metadataFile.exists() && !metadataFile.open(QIODevice::ReadOnly))
+    {
+        LogMsg(tr("Cannot read file %1: %2").arg(torrentFilePath, metadataFile.errorString()), Log::WARNING);
+        return std::nullopt;
+    }
+
+    const QByteArray data = resumeDataFile.readAll();
+    const QByteArray metadata = (metadataFile.isOpen() ? metadataFile.readAll() : "");
+
+    return loadTorrentResumeData(data, metadata);
+}
+
+std::optional<BitTorrent::LoadTorrentParams> BitTorrent::BencodeResumeDataStorage::loadTorrentResumeData(
+        const QByteArray &data, const QByteArray &metadata) const
+{
+    const QByteArray allData = ((metadata.isEmpty() || data.isEmpty())
+                                ? data : (data.chopped(1) + metadata.mid(1)));
+
+    lt::error_code ec;
+    const lt::bdecode_node root = lt::bdecode(allData, ec);
+    if (ec || (root.type() != lt::bdecode_node::dict_t))
+        return std::nullopt;
+
+    LoadTorrentParams torrentParams;
+    torrentParams.restored = true;
+    torrentParams.category = fromLTString(root.dict_find_string_value("qBt-category"));
+    torrentParams.name = fromLTString(root.dict_find_string_value("qBt-name"));
+    torrentParams.hasSeedStatus = root.dict_find_int_value("qBt-seedStatus");
+    torrentParams.firstLastPiecePriority = root.dict_find_int_value("qBt-firstLastPiecePriority");
+    torrentParams.seedingTimeLimit = root.dict_find_int_value("qBt-seedingTimeLimit", Torrent::USE_GLOBAL_SEEDING_TIME);
+
+    torrentParams.savePath = Profile::instance()->fromPortablePath(
+                Utils::Fs::toUniformPath(fromLTString(root.dict_find_string_value("qBt-savePath"))));
+    torrentParams.useAutoTMM = torrentParams.savePath.isEmpty();
+    if (!torrentParams.useAutoTMM)
+    {
+        torrentParams.downloadPath = Profile::instance()->fromPortablePath(
+                    Utils::Fs::toUniformPath(fromLTString(root.dict_find_string_value("qBt-downloadPath"))));
+    }
+
+    // TODO: The following code is deprecated. Replace with the commented one after several releases in 4.4.x.
+    // === BEGIN DEPRECATED CODE === //
+    const lt::bdecode_node contentLayoutNode = root.dict_find("qBt-contentLayout");
+    if (contentLayoutNode.type() == lt::bdecode_node::string_t)
+    {
+        const QString contentLayoutStr = fromLTString(contentLayoutNode.string_value());
+        torrentParams.contentLayout = Utils::String::toEnum(contentLayoutStr, TorrentContentLayout::Original);
+    }
+    else
+    {
+        const bool hasRootFolder = root.dict_find_int_value("qBt-hasRootFolder");
+        torrentParams.contentLayout = (hasRootFolder ? TorrentContentLayout::Original : TorrentContentLayout::NoSubfolder);
+    }
+    // === END DEPRECATED CODE === //
+    // === BEGIN REPLACEMENT CODE === //
+    //    torrentParams.contentLayout = Utils::String::parse(
+    //                fromLTString(root.dict_find_string_value("qBt-contentLayout")), TorrentContentLayout::Default);
+    // === END REPLACEMENT CODE === //
+
+    const lt::string_view ratioLimitString = root.dict_find_string_value("qBt-ratioLimit");
+    if (ratioLimitString.empty())
+        torrentParams.ratioLimit = root.dict_find_int_value("qBt-ratioLimit", Torrent::USE_GLOBAL_RATIO * 1000) / 1000.0;
+    else
+        torrentParams.ratioLimit = fromLTString(ratioLimitString).toDouble();
+
+    const lt::bdecode_node tagsNode = root.dict_find("qBt-tags");
+    if (tagsNode.type() == lt::bdecode_node::list_t)
+    {
+        for (int i = 0; i < tagsNode.list_size(); ++i)
+        {
+            const QString tag = fromLTString(tagsNode.list_string_value_at(i));
+            torrentParams.tags.insert(tag);
+        }
+    }
+
+    lt::add_torrent_params &p = torrentParams.ltAddTorrentParams;
+
+    p = lt::read_resume_data(root, ec);
+    p.save_path = Profile::instance()->fromPortablePath(fromLTString(p.save_path)).toStdString();
+
+    if (p.flags & lt::torrent_flags::stop_when_ready)
+    {
+        // If torrent has "stop_when_ready" flag set then it is actually "stopped"
+        torrentParams.stopped = true;
+        torrentParams.operatingMode = TorrentOperatingMode::AutoManaged;
+        // ...but temporarily "resumed" to perform some service jobs (e.g. checking)
+        p.flags &= ~lt::torrent_flags::paused;
+        p.flags |= lt::torrent_flags::auto_managed;
+    }
+    else
+    {
+        torrentParams.stopped = (p.flags & lt::torrent_flags::paused) && !(p.flags & lt::torrent_flags::auto_managed);
+        torrentParams.operatingMode = (p.flags & lt::torrent_flags::paused) || (p.flags & lt::torrent_flags::auto_managed)
+                ? TorrentOperatingMode::AutoManaged : TorrentOperatingMode::Forced;
+    }
+
+    const bool hasMetadata = (p.ti && p.ti->is_valid());
+    if (!hasMetadata && !root.dict_find("info-hash"))
+        return std::nullopt;
+
+    return torrentParams;
+}
+
+void BitTorrent::BencodeResumeDataStorage::store(const TorrentID &id, const LoadTorrentParams &resumeData) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, id, resumeData]()
+    {
+        m_asyncWorker->store(id, resumeData);
+    });
+}
+
+void BitTorrent::BencodeResumeDataStorage::remove(const TorrentID &id) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, id]()
+    {
+        m_asyncWorker->remove(id);
+    });
+}
+
+void BitTorrent::BencodeResumeDataStorage::storeQueue(const QVector<TorrentID> &queue) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, queue]()
+    {
+        m_asyncWorker->storeQueue(queue);
+    });
+}
+
+void BitTorrent::BencodeResumeDataStorage::loadQueue(const QString &queueFilename)
+{
+    QFile queueFile {queueFilename};
+    if (!queueFile.exists())
+        return;
+
+    if (queueFile.open(QFile::ReadOnly))
+    {
+        const QRegularExpression hashPattern {QLatin1String("^([A-Fa-f0-9]{40})$")};
+        QByteArray line;
+        int start = 0;
+        while (!(line = queueFile.readLine().trimmed()).isEmpty())
+        {
+            const QRegularExpressionMatch rxMatch = hashPattern.match(line);
+            if (rxMatch.hasMatch())
+            {
+                const auto torrentID = TorrentID::fromString(rxMatch.captured(1));
+                const int pos = m_registeredTorrents.indexOf(torrentID, start);
+                if (pos != -1)
+                {
+                    std::swap(m_registeredTorrents[start], m_registeredTorrents[pos]);
+                    ++start;
+                }
+            }
+        }
+    }
+    else
+    {
+        LogMsg(tr("Couldn't load torrents queue from '%1'. Error: %2")
+               .arg(queueFile.fileName(), queueFile.errorString()), Log::WARNING);
+    }
+}
+
+BitTorrent::BencodeResumeDataStorage::Worker::Worker(const QDir &resumeDataDir)
+    : m_resumeDataDir {resumeDataDir}
+{
+}
+
+void BitTorrent::BencodeResumeDataStorage::Worker::store(const TorrentID &id, const LoadTorrentParams &resumeData) const
+{
+    // We need to adjust native libtorrent resume data
+    lt::add_torrent_params p = resumeData.ltAddTorrentParams;
+    p.save_path = Profile::instance()->toPortablePath(QString::fromStdString(p.save_path)).toStdString();
+    if (resumeData.stopped)
+    {
+        p.flags |= lt::torrent_flags::paused;
+        p.flags &= ~lt::torrent_flags::auto_managed;
+    }
+    else
+    {
+        // Torrent can be actually "running" but temporarily "paused" to perform some
+        // service jobs behind the scenes so we need to restore it as "running"
+        if (resumeData.operatingMode == BitTorrent::TorrentOperatingMode::AutoManaged)
+        {
+            p.flags |= lt::torrent_flags::auto_managed;
+        }
+        else
+        {
+            p.flags &= ~lt::torrent_flags::paused;
+            p.flags &= ~lt::torrent_flags::auto_managed;
+        }
+    }
+
+    lt::entry data = lt::write_resume_data(p);
+
+    // metadata is stored in separate .torrent file
+    if (p.ti)
+    {
+        lt::entry::dictionary_type &dataDict = data.dict();
+        lt::entry metadata {lt::entry::dictionary_t};
+        lt::entry::dictionary_type &metadataDict = metadata.dict();
+        metadataDict.insert(dataDict.extract("info"));
+        metadataDict.insert(dataDict.extract("creation date"));
+        metadataDict.insert(dataDict.extract("created by"));
+        metadataDict.insert(dataDict.extract("comment"));
+
+        const QString torrentFilepath = m_resumeDataDir.absoluteFilePath(QString::fromLatin1("%1.torrent").arg(id.toString()));
+        const nonstd::expected<void, QString> result = Utils::IO::saveToFile(torrentFilepath, metadata);
+        if (!result)
+        {
+            LogMsg(tr("Couldn't save torrent metadata to '%1'. Error: %2.")
+                   .arg(torrentFilepath, result.error()), Log::CRITICAL);
+            return;
+        }
+    }
+
+    data["qBt-ratioLimit"] = static_cast<int>(resumeData.ratioLimit * 1000);
+    data["qBt-seedingTimeLimit"] = resumeData.seedingTimeLimit;
+    data["qBt-category"] = resumeData.category.toStdString();
+    data["qBt-tags"] = setToEntryList(resumeData.tags);
+    data["qBt-name"] = resumeData.name.toStdString();
+    data["qBt-seedStatus"] = resumeData.hasSeedStatus;
+    data["qBt-contentLayout"] = Utils::String::fromEnum(resumeData.contentLayout).toStdString();
+    data["qBt-firstLastPiecePriority"] = resumeData.firstLastPiecePriority;
+
+    if (!resumeData.useAutoTMM)
+    {
+        data["qBt-savePath"] = Profile::instance()->toPortablePath(resumeData.savePath).toStdString();
+        data["qBt-downloadPath"] = Profile::instance()->toPortablePath(resumeData.downloadPath).toStdString();
+    }
+
+    const QString resumeFilepath = m_resumeDataDir.absoluteFilePath(QString::fromLatin1("%1.fastresume").arg(id.toString()));
+    const nonstd::expected<void, QString> result = Utils::IO::saveToFile(resumeFilepath, data);
+    if (!result)
+    {
+        LogMsg(tr("Couldn't save torrent resume data to '%1'. Error: %2.")
+               .arg(resumeFilepath, result.error()), Log::CRITICAL);
+    }
+}
+
+void BitTorrent::BencodeResumeDataStorage::Worker::remove(const TorrentID &id) const
+{
+    const QString resumeFilename = QString::fromLatin1("%1.fastresume").arg(id.toString());
+    Utils::Fs::forceRemove(m_resumeDataDir.absoluteFilePath(resumeFilename));
+
+    const QString torrentFilename = QString::fromLatin1("%1.torrent").arg(id.toString());
+    Utils::Fs::forceRemove(m_resumeDataDir.absoluteFilePath(torrentFilename));
+}
+
+void BitTorrent::BencodeResumeDataStorage::Worker::storeQueue(const QVector<TorrentID> &queue) const
+{
+    QByteArray data;
+    data.reserve(((BitTorrent::TorrentID::length() * 2) + 1) * queue.size());
+    for (const BitTorrent::TorrentID &torrentID : queue)
+        data += (torrentID.toString().toLatin1() + '\n');
+
+    const QString filepath = m_resumeDataDir.absoluteFilePath(QLatin1String("queue"));
+    const nonstd::expected<void, QString> result = Utils::IO::saveToFile(filepath, data);
+    if (!result)
+    {
+        LogMsg(tr("Couldn't save data to '%1'. Error: %2")
+            .arg(filepath, result.error()), Log::CRITICAL);
+    }
+}

src/base/bittorrent/bencoderesumedatastorage.h

@@ -0,0 +1,67 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2015, 2018  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#pragma once
+
+#include <QDir>
+#include <QVector>
+
+#include "resumedatastorage.h"
+
+class QByteArray;
+class QThread;
+
+namespace BitTorrent
+{
+    class BencodeResumeDataStorage final : public ResumeDataStorage
+    {
+        Q_OBJECT
+        Q_DISABLE_COPY_MOVE(BencodeResumeDataStorage)
+
+    public:
+        explicit BencodeResumeDataStorage(const QString &path, QObject *parent = nullptr);
+        ~BencodeResumeDataStorage() override;
+
+        QVector<TorrentID> registeredTorrents() const override;
+        std::optional<LoadTorrentParams> load(const TorrentID &id) const override;
+        void store(const TorrentID &id, const LoadTorrentParams &resumeData) const override;
+        void remove(const TorrentID &id) const override;
+        void storeQueue(const QVector<TorrentID> &queue) const override;
+
+    private:
+        void loadQueue(const QString &queueFilename);
+        std::optional<LoadTorrentParams> loadTorrentResumeData(const QByteArray &data, const QByteArray &metadata) const;
+
+        const QDir m_resumeDataDir;
+        QVector<TorrentID> m_registeredTorrents;
+        QThread *m_ioThread = nullptr;
+
+        class Worker;
+        Worker *m_asyncWorker = nullptr;
+    };
+}

src/base/bittorrent/categoryoptions.cpp

@@ -0,0 +1,78 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2021  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 "categoryoptions.h"
+
+#include <QJsonObject>
+#include <QJsonValue>
+
+const QString OPTION_SAVEPATH {QStringLiteral("save_path")};
+const QString OPTION_DOWNLOADPATH {QStringLiteral("download_path")};
+
+BitTorrent::CategoryOptions BitTorrent::CategoryOptions::fromJSON(const QJsonObject &jsonObj)
+{
+    CategoryOptions options;
+    options.savePath = jsonObj.value(OPTION_SAVEPATH).toString();
+
+    const QJsonValue downloadPathValue = jsonObj.value(OPTION_DOWNLOADPATH);
+    if (downloadPathValue.isBool())
+        options.downloadPath = {downloadPathValue.toBool(), {}};
+    else if (downloadPathValue.isString())
+        options.downloadPath = {true, downloadPathValue.toString()};
+
+    return options;
+}
+
+QJsonObject BitTorrent::CategoryOptions::toJSON() const
+{
+    QJsonValue downloadPathValue = QJsonValue::Undefined;
+    if (downloadPath)
+    {
+        if (downloadPath->enabled)
+            downloadPathValue = downloadPath->path;
+        else
+            downloadPathValue = false;
+    }
+
+    return {
+        {OPTION_SAVEPATH, savePath},
+        {OPTION_DOWNLOADPATH, downloadPathValue}
+    };
+}
+
+bool BitTorrent::operator==(const BitTorrent::CategoryOptions::DownloadPathOption &left, const BitTorrent::CategoryOptions::DownloadPathOption &right)
+{
+    return ((left.enabled == right.enabled)
+            && (left.path == right.path));
+}
+
+bool BitTorrent::operator==(const BitTorrent::CategoryOptions &left, const BitTorrent::CategoryOptions &right)
+{
+    return ((left.savePath == right.savePath)
+            && (left.downloadPath == right.downloadPath));
+}

src/base/bittorrent/categoryoptions.h

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

src/base/bittorrent/customstorage.cpp

@@ -35,7 +35,7 @@
 #include "base/utils/fs.h"
 #include "common.h"
 
-#if (LIBTORRENT_VERSION_NUM >= 20000)
+#ifdef QBT_USES_LIBTORRENT2
 #include <libtorrent/session.hpp>
 
 std::unique_ptr<lt::disk_interface> customDiskIOConstructor(

src/base/bittorrent/customstorage.h

@@ -30,11 +30,10 @@
 
 #include <libtorrent/aux_/vector.hpp>
 #include <libtorrent/fwd.hpp>
-#include <libtorrent/version.hpp>
 
 #include <QString>
 
-#if (LIBTORRENT_VERSION_NUM >= 20000)
+#ifdef QBT_USES_LIBTORRENT2
 #include <libtorrent/disk_interface.hpp>
 #include <libtorrent/file_storage.hpp>
 #include <libtorrent/io_context.hpp>
@@ -46,7 +45,7 @@
 #include <libtorrent/storage.hpp>
 #endif
 
-#if (LIBTORRENT_VERSION_NUM >= 20000)
+#ifdef QBT_USES_LIBTORRENT2
 std::unique_ptr<lt::disk_interface> customDiskIOConstructor(
         lt::io_context &ioContext, lt::settings_interface const &settings, lt::counters &counters);
 

src/base/bittorrent/dbresumedatastorage.cpp

@@ -0,0 +1,691 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2021  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 "dbresumedatastorage.h"
+
+#include <utility>
+
+#include <libtorrent/bdecode.hpp>
+#include <libtorrent/bencode.hpp>
+#include <libtorrent/entry.hpp>
+#include <libtorrent/read_resume_data.hpp>
+#include <libtorrent/torrent_info.hpp>
+#include <libtorrent/write_resume_data.hpp>
+
+#include <QByteArray>
+#include <QFile>
+#include <QSet>
+#include <QSqlDatabase>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QThread>
+#include <QVector>
+
+#include "base/exceptions.h"
+#include "base/global.h"
+#include "base/logger.h"
+#include "base/profile.h"
+#include "base/utils/fs.h"
+#include "base/utils/string.h"
+#include "infohash.h"
+#include "loadtorrentparams.h"
+
+namespace
+{
+    const char DB_CONNECTION_NAME[] = "ResumeDataStorage";
+
+    const int DB_VERSION = 2;
+
+    const char DB_TABLE_META[] = "meta";
+    const char DB_TABLE_TORRENTS[] = "torrents";
+
+    const char META_VERSION[] = "version";
+
+    struct Column
+    {
+        QString name;
+        QString placeholder;
+    };
+
+    Column makeColumn(const char *columnName)
+    {
+        return {QLatin1String(columnName), (QLatin1Char(':') + QLatin1String(columnName))};
+    }
+
+    const Column DB_COLUMN_ID = makeColumn("id");
+    const Column DB_COLUMN_TORRENT_ID = makeColumn("torrent_id");
+    const Column DB_COLUMN_QUEUE_POSITION = makeColumn("queue_position");
+    const Column DB_COLUMN_NAME = makeColumn("name");
+    const Column DB_COLUMN_CATEGORY = makeColumn("category");
+    const Column DB_COLUMN_TAGS = makeColumn("tags");
+    const Column DB_COLUMN_TARGET_SAVE_PATH = makeColumn("target_save_path");
+    const Column DB_COLUMN_DOWNLOAD_PATH = makeColumn("download_path");
+    const Column DB_COLUMN_CONTENT_LAYOUT = makeColumn("content_layout");
+    const Column DB_COLUMN_RATIO_LIMIT = makeColumn("ratio_limit");
+    const Column DB_COLUMN_SEEDING_TIME_LIMIT = makeColumn("seeding_time_limit");
+    const Column DB_COLUMN_HAS_OUTER_PIECES_PRIORITY = makeColumn("has_outer_pieces_priority");
+    const Column DB_COLUMN_HAS_SEED_STATUS = makeColumn("has_seed_status");
+    const Column DB_COLUMN_OPERATING_MODE = makeColumn("operating_mode");
+    const Column DB_COLUMN_STOPPED = makeColumn("stopped");
+    const Column DB_COLUMN_RESUMEDATA = makeColumn("libtorrent_resume_data");
+    const Column DB_COLUMN_METADATA = makeColumn("metadata");
+    const Column DB_COLUMN_VALUE = makeColumn("value");
+
+    template <typename LTStr>
+    QString fromLTString(const LTStr &str)
+    {
+        return QString::fromUtf8(str.data(), static_cast<int>(str.size()));
+    }
+
+    QString quoted(const QString &name)
+    {
+        const QLatin1Char quote {'`'};
+
+        return (quote + name + quote);
+    }
+
+    QString makeCreateTableStatement(const QString &tableName, const QStringList &items)
+    {
+        return QString::fromLatin1("CREATE TABLE %1 (%2)").arg(quoted(tableName), items.join(QLatin1Char(',')));
+    }
+
+    std::pair<QString, QString> joinColumns(const QVector<Column> &columns)
+    {
+        int namesSize = columns.size();
+        int valuesSize = columns.size();
+        for (const Column &column : columns)
+        {
+            namesSize += column.name.size() + 2;
+            valuesSize += column.placeholder.size();
+        }
+
+        QString names;
+        names.reserve(namesSize);
+        QString values;
+        values.reserve(valuesSize);
+        for (const Column &column : columns)
+        {
+            names.append(quoted(column.name) + QLatin1Char(','));
+            values.append(column.placeholder + QLatin1Char(','));
+        }
+        names.chop(1);
+        values.chop(1);
+
+        return std::make_pair(names, values);
+    }
+
+    QString makeInsertStatement(const QString &tableName, const QVector<Column> &columns)
+    {
+        const auto [names, values] = joinColumns(columns);
+        return QString::fromLatin1("INSERT INTO %1 (%2) VALUES (%3)")
+                .arg(quoted(tableName), names, values);
+    }
+
+    QString makeUpdateStatement(const QString &tableName, const QVector<Column> &columns)
+    {
+        const auto [names, values] = joinColumns(columns);
+        return QString::fromLatin1("UPDATE %1 SET (%2) = (%3)")
+                .arg(quoted(tableName), names, values);
+    }
+
+    QString makeOnConflictUpdateStatement(const Column &constraint, const QVector<Column> &columns)
+    {
+        const auto [names, values] = joinColumns(columns);
+        return QString::fromLatin1(" ON CONFLICT (%1) DO UPDATE SET (%2) = (%3)")
+                .arg(quoted(constraint.name), names, values);
+    }
+
+    QString makeColumnDefinition(const Column &column, const char *definition)
+    {
+        return QString::fromLatin1("%1 %2").arg(quoted(column.name), QLatin1String(definition));
+    }
+}
+
+namespace BitTorrent
+{
+    class DBResumeDataStorage::Worker final : public QObject
+    {
+        Q_DISABLE_COPY_MOVE(Worker)
+
+    public:
+        Worker(const QString &dbPath, const QString &dbConnectionName);
+
+        void openDatabase() const;
+        void closeDatabase() const;
+
+        void store(const TorrentID &id, const LoadTorrentParams &resumeData) const;
+        void remove(const TorrentID &id) const;
+        void storeQueue(const QVector<TorrentID> &queue) const;
+
+    private:
+        const QString m_path;
+        const QString m_connectionName;
+    };
+}
+
+BitTorrent::DBResumeDataStorage::DBResumeDataStorage(const QString &dbPath, QObject *parent)
+    : ResumeDataStorage {parent}
+    , m_ioThread {new QThread(this)}
+{
+    const bool needCreateDB = !QFile::exists(dbPath);
+
+    auto db = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), DB_CONNECTION_NAME);
+    db.setDatabaseName(dbPath);
+    if (!db.open())
+        throw RuntimeError(db.lastError().text());
+
+    if (needCreateDB)
+    {
+        createDB();
+    }
+    else
+    {
+        const int dbVersion = currentDBVersion();
+        if (dbVersion == 1)
+            updateDBFromVersion1();
+    }
+
+    m_asyncWorker = new Worker(dbPath, QLatin1String("ResumeDataStorageWorker"));
+    m_asyncWorker->moveToThread(m_ioThread);
+    connect(m_ioThread, &QThread::finished, m_asyncWorker, &QObject::deleteLater);
+    m_ioThread->start();
+
+    RuntimeError *errPtr = nullptr;
+    QMetaObject::invokeMethod(m_asyncWorker, [this, &errPtr]()
+    {
+        try
+        {
+            m_asyncWorker->openDatabase();
+        }
+        catch (const RuntimeError &err)
+        {
+            errPtr = new RuntimeError(err);
+        }
+    }, Qt::BlockingQueuedConnection);
+
+    if (errPtr)
+        throw *errPtr;
+}
+
+BitTorrent::DBResumeDataStorage::~DBResumeDataStorage()
+{
+    QMetaObject::invokeMethod(m_asyncWorker, &Worker::closeDatabase);
+    QSqlDatabase::removeDatabase(DB_CONNECTION_NAME);
+
+    m_ioThread->quit();
+    m_ioThread->wait();
+}
+
+QVector<BitTorrent::TorrentID> BitTorrent::DBResumeDataStorage::registeredTorrents() const
+{
+    const auto selectTorrentIDStatement = QString::fromLatin1("SELECT %1 FROM %2 ORDER BY %3;")
+            .arg(quoted(DB_COLUMN_TORRENT_ID.name), quoted(DB_TABLE_TORRENTS), quoted(DB_COLUMN_QUEUE_POSITION.name));
+
+    auto db = QSqlDatabase::database(DB_CONNECTION_NAME);
+    QSqlQuery query {db};
+
+    if (!query.exec(selectTorrentIDStatement))
+        throw RuntimeError(query.lastError().text());
+
+    QVector<TorrentID> registeredTorrents;
+    registeredTorrents.reserve(query.size());
+    while (query.next())
+        registeredTorrents.append(BitTorrent::TorrentID::fromString(query.value(0).toString()));
+
+    return registeredTorrents;
+}
+
+std::optional<BitTorrent::LoadTorrentParams> BitTorrent::DBResumeDataStorage::load(const TorrentID &id) const
+{
+    const QString selectTorrentStatement =
+            QString(QLatin1String("SELECT * FROM %1 WHERE %2 = %3;"))
+            .arg(quoted(DB_TABLE_TORRENTS), quoted(DB_COLUMN_TORRENT_ID.name), DB_COLUMN_TORRENT_ID.placeholder);
+
+    auto db = QSqlDatabase::database(DB_CONNECTION_NAME);
+    QSqlQuery query {db};
+    try
+    {
+        if (!query.prepare(selectTorrentStatement))
+            throw RuntimeError(query.lastError().text());
+
+        query.bindValue(DB_COLUMN_TORRENT_ID.placeholder, id.toString());
+        if (!query.exec())
+            throw RuntimeError(query.lastError().text());
+
+        if (!query.next())
+            throw RuntimeError(tr("Not found."));
+    }
+    catch (const RuntimeError &err)
+    {
+        LogMsg(tr("Couldn't load resume data of torrent '%1'. Error: %2")
+            .arg(id.toString(), err.message()), Log::CRITICAL);
+        return std::nullopt;
+    }
+
+    LoadTorrentParams resumeData;
+    resumeData.restored = true;
+    resumeData.name = query.value(DB_COLUMN_NAME.name).toString();
+    resumeData.category = query.value(DB_COLUMN_CATEGORY.name).toString();
+    const QString tagsData = query.value(DB_COLUMN_TAGS.name).toString();
+    if (!tagsData.isEmpty())
+    {
+        const QStringList tagList = tagsData.split(QLatin1Char(','));
+        resumeData.tags.insert(tagList.cbegin(), tagList.cend());
+    }
+    resumeData.hasSeedStatus = query.value(DB_COLUMN_HAS_SEED_STATUS.name).toBool();
+    resumeData.firstLastPiecePriority = query.value(DB_COLUMN_HAS_OUTER_PIECES_PRIORITY.name).toBool();
+    resumeData.ratioLimit = query.value(DB_COLUMN_RATIO_LIMIT.name).toInt() / 1000.0;
+    resumeData.seedingTimeLimit = query.value(DB_COLUMN_SEEDING_TIME_LIMIT.name).toInt();
+    resumeData.contentLayout = Utils::String::toEnum<TorrentContentLayout>(
+                query.value(DB_COLUMN_CONTENT_LAYOUT.name).toString(), TorrentContentLayout::Original);
+    resumeData.operatingMode = Utils::String::toEnum<TorrentOperatingMode>(
+                query.value(DB_COLUMN_OPERATING_MODE.name).toString(), TorrentOperatingMode::AutoManaged);
+    resumeData.stopped = query.value(DB_COLUMN_STOPPED.name).toBool();
+
+    resumeData.savePath = Profile::instance()->fromPortablePath(
+                Utils::Fs::toUniformPath(query.value(DB_COLUMN_TARGET_SAVE_PATH.name).toString()));
+    resumeData.useAutoTMM = resumeData.savePath.isEmpty();
+    if (!resumeData.useAutoTMM)
+    {
+        resumeData.downloadPath = Profile::instance()->fromPortablePath(
+                    Utils::Fs::toUniformPath(query.value(DB_COLUMN_DOWNLOAD_PATH.name).toString()));
+    }
+
+    const QByteArray bencodedResumeData = query.value(DB_COLUMN_RESUMEDATA.name).toByteArray();
+    const QByteArray bencodedMetadata = query.value(DB_COLUMN_METADATA.name).toByteArray();
+    const QByteArray allData = ((bencodedMetadata.isEmpty() || bencodedResumeData.isEmpty())
+                                ? bencodedResumeData
+                                : (bencodedResumeData.chopped(1) + bencodedMetadata.mid(1)));
+
+    lt::error_code ec;
+    const lt::bdecode_node root = lt::bdecode(allData, ec);
+
+    resumeData.downloadPath = Profile::instance()->fromPortablePath(
+                Utils::Fs::toUniformPath(fromLTString(root.dict_find_string_value("qBt-downloadPath"))));
+
+    lt::add_torrent_params &p = resumeData.ltAddTorrentParams;
+
+    p = lt::read_resume_data(root, ec);
+    p.save_path = Profile::instance()->fromPortablePath(fromLTString(p.save_path)).toStdString();
+
+    return resumeData;
+}
+
+void BitTorrent::DBResumeDataStorage::store(const TorrentID &id, const LoadTorrentParams &resumeData) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, id, resumeData]()
+    {
+        m_asyncWorker->store(id, resumeData);
+    });
+}
+
+void BitTorrent::DBResumeDataStorage::remove(const BitTorrent::TorrentID &id) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, id]()
+    {
+        m_asyncWorker->remove(id);
+    });
+}
+
+void BitTorrent::DBResumeDataStorage::storeQueue(const QVector<TorrentID> &queue) const
+{
+    QMetaObject::invokeMethod(m_asyncWorker, [this, queue]()
+    {
+        m_asyncWorker->storeQueue(queue);
+    });
+}
+
+int BitTorrent::DBResumeDataStorage::currentDBVersion() const
+{
+    const auto selectDBVersionStatement = QString::fromLatin1("SELECT %1 FROM %2 WHERE %3 = %4;")
+            .arg(quoted(DB_COLUMN_VALUE.name), quoted(DB_TABLE_META), quoted(DB_COLUMN_NAME.name), DB_COLUMN_NAME.placeholder);
+
+    auto db = QSqlDatabase::database(DB_CONNECTION_NAME);
+    QSqlQuery query {db};
+
+    if (!query.prepare(selectDBVersionStatement))
+        throw RuntimeError(query.lastError().text());
+
+    query.bindValue(DB_COLUMN_NAME.placeholder, QString::fromLatin1(META_VERSION));
+
+    if (!query.exec())
+        throw RuntimeError(query.lastError().text());
+
+    if (!query.next())
+        throw RuntimeError(tr("Database is corrupted."));
+
+    bool ok;
+    const int dbVersion = query.value(0).toInt(&ok);
+    if (!ok)
+        throw RuntimeError(tr("Database is corrupted."));
+
+    return dbVersion;
+}
+
+void BitTorrent::DBResumeDataStorage::createDB() const
+{
+    auto db = QSqlDatabase::database(DB_CONNECTION_NAME);
+
+    if (!db.transaction())
+        throw RuntimeError(db.lastError().text());
+
+    QSqlQuery query {db};
+
+    try
+    {
+        const QStringList tableMetaItems = {
+            makeColumnDefinition(DB_COLUMN_ID, "INTEGER PRIMARY KEY"),
+            makeColumnDefinition(DB_COLUMN_NAME, "TEXT NOT NULL UNIQUE"),
+            makeColumnDefinition(DB_COLUMN_VALUE, "BLOB")
+        };
+        const QString createTableMetaQuery = makeCreateTableStatement(DB_TABLE_META, tableMetaItems);
+        if (!query.exec(createTableMetaQuery))
+            throw RuntimeError(query.lastError().text());
+
+        const QString insertMetaVersionQuery = makeInsertStatement(DB_TABLE_META, {DB_COLUMN_NAME, DB_COLUMN_VALUE});
+        if (!query.prepare(insertMetaVersionQuery))
+            throw RuntimeError(query.lastError().text());
+
+        query.bindValue(DB_COLUMN_NAME.placeholder, QString::fromLatin1(META_VERSION));
+        query.bindValue(DB_COLUMN_VALUE.placeholder, DB_VERSION);
+
+        if (!query.exec())
+            throw RuntimeError(query.lastError().text());
+
+        const QStringList tableTorrentsItems = {
+            makeColumnDefinition(DB_COLUMN_ID, "INTEGER PRIMARY KEY"),
+            makeColumnDefinition(DB_COLUMN_TORRENT_ID, "BLOB NOT NULL UNIQUE"),
+            makeColumnDefinition(DB_COLUMN_QUEUE_POSITION, "INTEGER NOT NULL DEFAULT -1"),
+            makeColumnDefinition(DB_COLUMN_NAME, "TEXT"),
+            makeColumnDefinition(DB_COLUMN_CATEGORY, "TEXT"),
+            makeColumnDefinition(DB_COLUMN_TAGS, "TEXT"),
+            makeColumnDefinition(DB_COLUMN_TARGET_SAVE_PATH, "TEXT"),
+            makeColumnDefinition(DB_COLUMN_CONTENT_LAYOUT, "TEXT NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_RATIO_LIMIT, "INTEGER NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_SEEDING_TIME_LIMIT, "INTEGER NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_HAS_OUTER_PIECES_PRIORITY, "INTEGER NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_HAS_SEED_STATUS, "INTEGER NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_OPERATING_MODE, "TEXT NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_STOPPED, "INTEGER NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_RESUMEDATA, "BLOB NOT NULL"),
+            makeColumnDefinition(DB_COLUMN_METADATA, "BLOB")
+        };
+        const QString createTableTorrentsQuery = makeCreateTableStatement(DB_TABLE_TORRENTS, tableTorrentsItems);
+        if (!query.exec(createTableTorrentsQuery))
+            throw RuntimeError(query.lastError().text());
+
+        if (!db.commit())
+            throw RuntimeError(db.lastError().text());
+    }
+    catch (const RuntimeError &)
+    {
+        db.rollback();
+        throw;
+    }
+}
+
+void BitTorrent::DBResumeDataStorage::updateDBFromVersion1() const
+{
+    auto db = QSqlDatabase::database(DB_CONNECTION_NAME);
+
+    if (!db.transaction())
+        throw RuntimeError(db.lastError().text());
+
+    QSqlQuery query {db};
+
+    try
+    {
+        const auto alterTableTorrentsQuery = QString::fromLatin1("ALTER TABLE %1 ADD %2")
+                .arg(quoted(DB_TABLE_TORRENTS), makeColumnDefinition(DB_COLUMN_DOWNLOAD_PATH, "TEXT"));
+        if (!query.exec(alterTableTorrentsQuery))
+            throw RuntimeError(query.lastError().text());
+
+        const QString updateMetaVersionQuery = makeUpdateStatement(DB_TABLE_META, {DB_COLUMN_NAME, DB_COLUMN_VALUE});
+        if (!query.prepare(updateMetaVersionQuery))
+            throw RuntimeError(query.lastError().text());
+
+        query.bindValue(DB_COLUMN_NAME.placeholder, QString::fromLatin1(META_VERSION));
+        query.bindValue(DB_COLUMN_VALUE.placeholder, DB_VERSION);
+
+        if (!query.exec())
+            throw RuntimeError(query.lastError().text());
+
+        if (!db.commit())
+            throw RuntimeError(db.lastError().text());
+    }
+    catch (const RuntimeError &)
+    {
+        db.rollback();
+        throw;
+    }
+}
+
+BitTorrent::DBResumeDataStorage::Worker::Worker(const QString &dbPath, const QString &dbConnectionName)
+    : m_path {dbPath}
+    , m_connectionName {dbConnectionName}
+{
+}
+
+void BitTorrent::DBResumeDataStorage::Worker::openDatabase() const
+{
+    auto db = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), m_connectionName);
+    db.setDatabaseName(m_path);
+    if (!db.open())
+        throw RuntimeError(db.lastError().text());
+}
+
+void BitTorrent::DBResumeDataStorage::Worker::closeDatabase() const
+{
+    QSqlDatabase::removeDatabase(m_connectionName);
+}
+
+void BitTorrent::DBResumeDataStorage::Worker::store(const TorrentID &id, const LoadTorrentParams &resumeData) const
+{
+    // We need to adjust native libtorrent resume data
+    lt::add_torrent_params p = resumeData.ltAddTorrentParams;
+    p.save_path = Profile::instance()->toPortablePath(QString::fromStdString(p.save_path)).toStdString();
+    if (resumeData.stopped)
+    {
+        p.flags |= lt::torrent_flags::paused;
+        p.flags &= ~lt::torrent_flags::auto_managed;
+    }
+    else
+    {
+        // Torrent can be actually "running" but temporarily "paused" to perform some
+        // service jobs behind the scenes so we need to restore it as "running"
+        if (resumeData.operatingMode == BitTorrent::TorrentOperatingMode::AutoManaged)
+        {
+            p.flags |= lt::torrent_flags::auto_managed;
+        }
+        else
+        {
+            p.flags &= ~lt::torrent_flags::paused;
+            p.flags &= ~lt::torrent_flags::auto_managed;
+        }
+    }
+
+    QVector<Column> columns {
+        DB_COLUMN_TORRENT_ID,
+        DB_COLUMN_NAME,
+        DB_COLUMN_CATEGORY,
+        DB_COLUMN_TAGS,
+        DB_COLUMN_TARGET_SAVE_PATH,
+        DB_COLUMN_CONTENT_LAYOUT,
+        DB_COLUMN_RATIO_LIMIT,
+        DB_COLUMN_SEEDING_TIME_LIMIT,
+        DB_COLUMN_HAS_OUTER_PIECES_PRIORITY,
+        DB_COLUMN_HAS_SEED_STATUS,
+        DB_COLUMN_OPERATING_MODE,
+        DB_COLUMN_STOPPED,
+        DB_COLUMN_RESUMEDATA
+    };
+
+    lt::entry data = lt::write_resume_data(p);
+
+    // metadata is stored in separate column
+    QByteArray bencodedMetadata;
+    if (p.ti)
+    {
+        lt::entry::dictionary_type &dataDict = data.dict();
+        lt::entry metadata {lt::entry::dictionary_t};
+        lt::entry::dictionary_type &metadataDict = metadata.dict();
+        metadataDict.insert(dataDict.extract("info"));
+        metadataDict.insert(dataDict.extract("creation date"));
+        metadataDict.insert(dataDict.extract("created by"));
+        metadataDict.insert(dataDict.extract("comment"));
+
+        try
+        {
+            bencodedMetadata.reserve(512 * 1024);
+            lt::bencode(std::back_inserter(bencodedMetadata), metadata);
+        }
+        catch (const std::exception &err)
+        {
+            LogMsg(tr("Couldn't save torrent metadata. Error: %1.")
+                   .arg(QString::fromLocal8Bit(err.what())), Log::CRITICAL);
+            return;
+        }
+
+        columns.append(DB_COLUMN_METADATA);
+    }
+
+    QByteArray bencodedResumeData;
+    bencodedResumeData.reserve(256 * 1024);
+    lt::bencode(std::back_inserter(bencodedResumeData), data);
+
+    const QString insertTorrentStatement = makeInsertStatement(DB_TABLE_TORRENTS, columns)
+            + makeOnConflictUpdateStatement(DB_COLUMN_TORRENT_ID, columns);
+    auto db = QSqlDatabase::database(m_connectionName);
+    QSqlQuery query {db};
+
+    try
+    {
+        if (!query.prepare(insertTorrentStatement))
+            throw RuntimeError(query.lastError().text());
+
+        query.bindValue(DB_COLUMN_TORRENT_ID.placeholder, id.toString());
+        query.bindValue(DB_COLUMN_NAME.placeholder, resumeData.name);
+        query.bindValue(DB_COLUMN_CATEGORY.placeholder, resumeData.category);
+        query.bindValue(DB_COLUMN_TAGS.placeholder, (resumeData.tags.isEmpty()
+            ? QVariant(QVariant::String) : resumeData.tags.join(QLatin1String(","))));
+        query.bindValue(DB_COLUMN_CONTENT_LAYOUT.placeholder, Utils::String::fromEnum(resumeData.contentLayout));
+        query.bindValue(DB_COLUMN_RATIO_LIMIT.placeholder, static_cast<int>(resumeData.ratioLimit * 1000));
+        query.bindValue(DB_COLUMN_SEEDING_TIME_LIMIT.placeholder, resumeData.seedingTimeLimit);
+        query.bindValue(DB_COLUMN_HAS_OUTER_PIECES_PRIORITY.placeholder, resumeData.firstLastPiecePriority);
+        query.bindValue(DB_COLUMN_HAS_SEED_STATUS.placeholder, resumeData.hasSeedStatus);
+        query.bindValue(DB_COLUMN_OPERATING_MODE.placeholder, Utils::String::fromEnum(resumeData.operatingMode));
+        query.bindValue(DB_COLUMN_STOPPED.placeholder, resumeData.stopped);
+
+        if (!resumeData.useAutoTMM)
+        {
+            query.bindValue(DB_COLUMN_TARGET_SAVE_PATH.placeholder, Profile::instance()->toPortablePath(resumeData.savePath));
+            query.bindValue(DB_COLUMN_DOWNLOAD_PATH.placeholder, Profile::instance()->toPortablePath(resumeData.downloadPath));
+        }
+
+        query.bindValue(DB_COLUMN_RESUMEDATA.placeholder, bencodedResumeData);
+        if (!bencodedMetadata.isEmpty())
+            query.bindValue(DB_COLUMN_METADATA.placeholder, bencodedMetadata);
+
+        if (!query.exec())
+            throw RuntimeError(query.lastError().text());
+    }
+    catch (const RuntimeError &err)
+    {
+        LogMsg(tr("Couldn't store resume data for torrent '%1'. Error: %2")
+            .arg(id.toString(), err.message()), Log::CRITICAL);
+    }
+}
+
+void BitTorrent::DBResumeDataStorage::Worker::remove(const TorrentID &id) const
+{
+    const auto deleteTorrentStatement = QString::fromLatin1("DELETE FROM %1 WHERE %2 = %3;")
+            .arg(quoted(DB_TABLE_TORRENTS), quoted(DB_COLUMN_TORRENT_ID.name), DB_COLUMN_TORRENT_ID.placeholder);
+
+    auto db = QSqlDatabase::database(m_connectionName);
+    QSqlQuery query {db};
+
+    try
+    {
+        if (!query.prepare(deleteTorrentStatement))
+            throw RuntimeError(query.lastError().text());
+
+        query.bindValue(DB_COLUMN_TORRENT_ID.placeholder, id.toString());
+        if (!query.exec())
+            throw RuntimeError(query.lastError().text());
+    }
+    catch (const RuntimeError &err)
+    {
+        LogMsg(tr("Couldn't delete resume data of torrent '%1'. Error: %2")
+            .arg(id.toString(), err.message()), Log::CRITICAL);
+    }
+}
+
+void BitTorrent::DBResumeDataStorage::Worker::storeQueue(const QVector<TorrentID> &queue) const
+{
+    const auto updateQueuePosStatement = QString::fromLatin1("UPDATE %1 SET %2 = %3 WHERE %4 = %5;")
+            .arg(quoted(DB_TABLE_TORRENTS), quoted(DB_COLUMN_QUEUE_POSITION.name), DB_COLUMN_QUEUE_POSITION.placeholder
+                 , quoted(DB_COLUMN_TORRENT_ID.name), DB_COLUMN_TORRENT_ID.placeholder);
+
+    auto db = QSqlDatabase::database(m_connectionName);
+
+    try
+    {
+        if (!db.transaction())
+            throw RuntimeError(db.lastError().text());
+
+        QSqlQuery query {db};
+
+        try
+        {
+            if (!query.prepare(updateQueuePosStatement))
+                throw RuntimeError(query.lastError().text());
+
+            int pos = 0;
+            for (const TorrentID &torrentID : queue)
+            {
+                query.bindValue(DB_COLUMN_TORRENT_ID.placeholder, torrentID.toString());
+                query.bindValue(DB_COLUMN_QUEUE_POSITION.placeholder, pos++);
+                if (!query.exec())
+                    throw RuntimeError(query.lastError().text());
+            }
+
+            if (!db.commit())
+                throw RuntimeError(db.lastError().text());
+        }
+        catch (const RuntimeError &)
+        {
+            db.rollback();
+            throw;
+        }
+    }
+    catch (const RuntimeError &err)
+    {
+        LogMsg(tr("Couldn't store torrents queue positions. Error: %1")
+            .arg(err.message()), Log::CRITICAL);
+    }
+}

src/base/bittorrent/dbresumedatastorage.h

@@ -0,0 +1,62 @@
+/*
+ * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2021  Vladimir Golovnev <glassez@yandex.ru>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ */
+
+#pragma once
+
+#include "resumedatastorage.h"
+
+class QThread;
+
+namespace BitTorrent
+{
+    class DBResumeDataStorage final : public ResumeDataStorage
+    {
+        Q_OBJECT
+        Q_DISABLE_COPY_MOVE(DBResumeDataStorage)
+
+    public:
+        explicit DBResumeDataStorage(const QString &dbPath, QObject *parent = nullptr);
+        ~DBResumeDataStorage() override;
+
+        QVector<TorrentID> registeredTorrents() const override;
+        std::optional<LoadTorrentParams> load(const TorrentID &id) const override;
+        void store(const TorrentID &id, const LoadTorrentParams &resumeData) const override;
+        void remove(const TorrentID &id) const override;
+        void storeQueue(const QVector<TorrentID> &queue) const override;
+
+    private:
+        int currentDBVersion() const;
+        void createDB() const;
+        void updateDBFromVersion1() const;
+
+        QThread *m_ioThread = nullptr;
+
+        class Worker;
+        Worker *m_asyncWorker = nullptr;
+    };
+}

src/base/bittorrent/filesearcher.cpp

@@ -34,7 +34,7 @@
 #include "base/bittorrent/infohash.h"
 
 void FileSearcher::search(const BitTorrent::TorrentID &id, const QStringList &originalFileNames
-                          , const QString &completeSavePath, const QString &incompleteSavePath)
+                          , const QString &savePath, const QString &downloadPath)
 {
     const auto findInDir = [](const QString &dirPath, QStringList &fileNames) -> bool
     {
@@ -56,14 +56,14 @@ void FileSearcher::search(const BitTorrent::TorrentID &id, const QStringList &or
         return found;
     };
 
-    QString savePath = completeSavePath;
+    QString usedPath = savePath;
     QStringList adjustedFileNames = originalFileNames;
-    const bool found = findInDir(savePath, adjustedFileNames);
-    if (!found && !incompleteSavePath.isEmpty())
+    const bool found = findInDir(usedPath, adjustedFileNames);
+    if (!found && !downloadPath.isEmpty())
     {
-        savePath = incompleteSavePath;
-        findInDir(savePath, adjustedFileNames);
+        usedPath = downloadPath;
+        findInDir(usedPath, adjustedFileNames);
     }
 
-    emit searchFinished(id, savePath, adjustedFileNames);
+    emit searchFinished(id, usedPath, adjustedFileNames);
 }