Bump to 4.3.9

PR #15595.

.appveyor.yml

@@ -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_64
-  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries_64.7z
+  QBT_VER_URL: https://builds.shiki.hu/appveyor/version
+  QBT_LIB_URL: https://builds.shiki.hu/appveyor/qbt_libraries.7z
 
 # project directory
 clone_folder: *REPO_DIR
@@ -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_64.7z" -o"c:\qbt" > nul
+  - 7z x "%CACHE_DIR%\qt5_32.7z" -o"c:\qbt" > nul
 
 before_build:
   # setup env
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
+  - 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;
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+**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

@@ -1,76 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,5 +0,0 @@
-<!--
-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

@@ -1,18 +0,0 @@
-# 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

@@ -1,68 +0,0 @@
-#!/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,7 +11,10 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Install tools
-        uses: actions/setup-python@v2
+        run: |
+          sudo apt update
+          sudo apt install zsh
 
       - name: Check files
-        uses: pre-commit/action@v2.0.3
+        run: |
+          ./.github/workflows/file_health.sh

.github/workflows/ci_macos.yaml

@@ -4,17 +4,13 @@ on: [pull_request, push]
 jobs:
   ci:
     name: Build
-    runs-on: macos-latest
+    runs-on: macos-10.15
 
     strategy:
-      fail-fast: false
       matrix:
-        libt_version: ["2.0.4", "1.2.14"]
+        libt_version: ["v1.2.12"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.2.0"]
-        exclude:
-          - libt_version: "1.2.14"
-            qt_version: "6.2.0"
+      fail-fast: false
 
     env:
       openssl_root: /usr/local/opt/openssl@1.1
@@ -23,28 +19,29 @@ 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 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 }}
+            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
 
       - name: Install libtorrent
         run: |
-          git clone --branch v${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone --branch ${{ matrix.libt_version }} --depth 1 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" \
@@ -55,37 +52,22 @@ jobs:
           cmake --build build
           sudo cmake --install build
 
-      - name: Build qBittorrent (Qt5)
-        if: ${{ startsWith(matrix.qt_version, 5) }}
+      - name: Build qBittorrent
         run: |
+          export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
-            -DQt5_DIR="$Qt5_DIR" \
+            -D${{ matrix.qbt_gui }} \
             -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          cmake --build build
-
-      - name: Build qBittorrent (Qt6)
-        if: ${{ startsWith(matrix.qt_version, 6) }}
-        run: |
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
-            -DQT6=ON \
-            -DQt6_DIR="$Qt6_DIR" \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
           cmake --build build
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}
           path: |
             build/qbittorrent.app
             build/qbittorrent-nox.app

.github/workflows/ci_ubuntu.yaml

@@ -7,43 +7,43 @@ jobs:
     runs-on: ubuntu-20.04
 
     strategy:
-      fail-fast: false
       matrix:
-        libt_version: ["2.0.4", "1.2.14"]
+        libt_version: ["v1.2.12"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.2.0"]
-        exclude:
-          - libt_version: "1.2.14"
-            qt_version: "6.2.0"
+      fail-fast: false
 
     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 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
+            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...
 
+      # 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
-        uses: jurplel/install-qt-action@v2
-        with:
-          version: ${{ matrix.qt_version }}
+        run: |
+          sudo add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
+          sudo apt install \
+            qt515base qt515svg qt515tools
 
       - name: Install libtorrent
         run: |
-          git clone --branch v${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
+          git clone --branch ${{ matrix.libt_version }} --depth 1 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" \
@@ -54,41 +54,26 @@ jobs:
           cmake --build build
           sudo cmake --install build
 
-      - name: Build qBittorrent (Qt5)
-        if: ${{ startsWith(matrix.qt_version, 5) }}
+      - name: Build qBittorrent
         run: |
+          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 \
-            -DQt5_DIR="$Qt5_DIR" \
             -D${{ matrix.qbt_gui }} \
             -DVERBOSE_CONFIGURE=ON \
             --graphviz=build/target_graph.dot
           cmake --build build
-          sudo cmake --install build
 
-      - name: Build qBittorrent (Qt6)
-        if: ${{ startsWith(matrix.qt_version, 6) }}
-        run: |
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DQt6_DIR="$Qt6_DIR" \
-            -DQT6=ON \
-            -D${{ matrix.qbt_gui }} \
-            -DVERBOSE_CONFIGURE=ON \
-            --graphviz=build/target_graph.dot
-          cmake --build build
-          sudo cmake --install build
+      - name: Install qBittorrent
+        run: sudo cmake --install build
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          name: qBittorrent-CI_ubuntu-20.04-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}
           path: |
             build/compile_commands.json
             build/install_manifest.txt

.github/workflows/ci_windows.yaml

@@ -4,24 +4,12 @@ on: [pull_request, push]
 jobs:
   ci:
     name: Build
-    runs-on: windows-latest
-
-    strategy:
-      matrix:
-        libt_version: ["v2.0.4", "v1.2.14"]
-      fail-fast: false
-
-    env:
-      boost_path: "${{ github.workspace }}/boost"
-      libtorrent_path: "${{ github.workspace }}/libtorrent"
+    runs-on: windows-2019
 
     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
@@ -53,12 +41,12 @@ jobs:
       - name: Install dependencies
         run: |
           $packages = `
-            "openssl:x64-windows-static-release",
+            "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",
-            "zlib:x64-windows-static-release"
+            "qt5-winextras:x64-windows-static-release"
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
             --overlay-triplets="${{ github.workspace }}/triplets_overlay" `
             --no-dry-run
@@ -67,33 +55,9 @@ jobs:
             --clean-after-build `
             $packages
 
-      - 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 libtorrent
-        run: |
-          git clone --branch ${{ matrix.libt_version }} --depth 1 https://github.com/arvidn/libtorrent.git
-          cd libtorrent
-          git submodule update --init --recursive
-          cmake `
-            -B build `
-            -G "Ninja" `
-            -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-            -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
+      # 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: Build qBittorrent
         run: |
@@ -103,26 +67,19 @@ jobs:
             -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
-          mkdir upload/cmake
-          copy build/compile_commands.json upload/cmake
-          copy build/target_graph.dot upload/cmake
-
       - name: Upload build artifacts
         uses: actions/upload-artifact@v2
         with:
-          name: qBittorrent-CI_Windows-x64_libtorrent-${{ matrix.libt_version }}
-          path: upload
+          name: qBittorrent-CI_Windows-x64
+          path: |
+            build/compile_commands.json
+            build/qbittorrent.exe
+            build/qbittorrent.pdb
+            build/target_graph.dot
+            dist/windows/qt.conf

.github/workflows/coverity-scan.yml

@@ -1,67 +0,0 @@
-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 add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
-          sudo apt update
-          sudo apt install \
-            build-essential cmake ninja-build pkg-config \
-            libboost-dev libssl-dev qt515base qt515svg qt515tools zlib1g-dev
-
-      - name: Install libtorrent
-        run: |
-          git clone --branch v2.0.4 --depth 1 https://github.com/arvidn/libtorrent.git
-          cd libtorrent
-          git submodule update --init --recursive
-          cmake \
-            -B build \
-            -G "Ninja" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -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=Release \
-            -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

@@ -0,0 +1,85 @@
+#!/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

@@ -1,22 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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,18 +12,15 @@ 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(minQt5Version 5.15.2)
-set(minQt6Version 6.2)
+set(minQtVersion 5.11)
 set(minOpenSSLVersion 1.1.1)
-set(minLibtorrent1Version 1.2.14)
-set(minLibtorrentVersion 2.0.4)
+set(minLibtorrentVersion 1.2.12)
 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,14 +6,22 @@ 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
 
@@ -186,26 +194,28 @@ Following these guidelines helps maintainers and the community understand your s
 
 # Opening a pull request
 
-*   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).
+### 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].
 
+### 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-git-commit-message-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md#10-git-commit-message
+[coding-guidelines-thread-url]: https://github.com/qbittorrent/qBittorrent/issues/2192
 [commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
 [forum-url]: http://forum.qbittorrent.org/
 [howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
-[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,6 +1,168 @@
-Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.4.0
-    - FEATURE: Add support for creating v2 torrents(requires libtorrent 2.0.x) (Chocobo1)
-    - FEATURE: Expose libtorrent hashing_threads settings (Anton Bershanskiy)
+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)
+    - WEBUI: Fix WebUI crash when tracker URL is invalid (Chocobo1)
+    - WEBUI: Revert "WebUI: group trackers by hostname" (Chocobo1)
+    - WINDOWS: Remove Windows Vista support from manifest (xavier2k6)
+    - WINDOWS: NSIS: Update Korean, Indonesian and Traditional Chinese translation (JungHee Lee, Faisal Al-Munawar Fathur Rahman, SiderealArt)
+
+Sun Aug 29 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.8
+    - BUGFIX: Delay processing of watched folders (#15282) (glassez)
+    - BUGFIX: Use the same icon for selecting folders/files (Chocobo1)
+    - BUGFIX: Use default upper limits for ddns entries (Chocobo1)
+    - WEBUI: Expose SSRF mitigation (#15247) (Sylvain Finot)
+    - WEBUI: Update webui libraries (Chocobo1)
+    - WEBUI: Group trackers by hostname (#15264) (Mengyang Li)
+    - WEBUI: Improve "last activity" calculation in WebAPI (#15339) (Chocobo1)
+    - WINDOWS: NSIS: Add Polish translation (#15262) (Matthaiks)
+
+Tue Aug 03 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.7
+    - BUGFIX: Don't forget to start Watched folders timer (glassez)
+    - BUGFIX: Don't close tags menu when toggling items (tgregerson)
+    - BUGFIX: Don't overwrite tracker message (glassez)
+    - BUGFIX: Bump file pool size (#14966) (An0n)
+    - BUGFIX: Properly create "clean path" for watched folder (glassez)
+    - WEBUI: Disconnect comment links (Daniel Aleksandersen)
+    - WINDOWS: NSIS: Update Danish translation (scootergrisen)
+
+Sat Jun 26 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.6
+    - FEATURE: New languages: Mongolian, Persian, Thai
+    - BUGFIX: Provide correct error description in "upload mode" (glassez)
+    - BUGFIX: Allow adding torrents with relative save path (glassez)
+    - BUGFIX: Fix main window turns blank after restoring from tray (#15031) (Chocobo1)
+    - BUGFIX: Remove the lockfile on exit (#14997) (brvphoenix)
+    - BUGFIX: Improve "Watched folders" feature (glassez)
+    - BUGFIX: Keep sub-sorting order (#15074) (Dmitry Khlestkov)
+    - BUGFIX: Properly add torrent with new tags (glassez)
+    - WINDOWS: NSIS: Update Japanese, Turkish, Hungarian, Swedish translation (maboroshin, Burak Yavuz, xkrstudio, nonew-star)
+
+Sun May 02 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.5
+    - BUGFIX: Move cursor to the end when autofilling URL/hash in "Download from URLs" dialog (Chocobo1)
+    - BUGFIX: Sort invalid QDateTime values after valid values (Chocobo1)
+    - BUGFIX: Fix tabChangesFocus attribute in "Edit trackers" dialog (Christoph Rackwitz)
+    - BUGFIX: Update DynDNS register url (zhuangzi926)
+    - BUGFIX: Handle "not enough disk space" error more graciously (glassez)
+    - BUGFIX: Correctly draw progress background with stylesheet (jagannatharjun)
+    - WEBUI: Fix magnet url from the search facility (Chocobo1)
+    - WEBUI: Revise folder monitoring functions (Chocobo1)
+    - WEBUI: Fix magnet url from the browser (brvphoenix)
+    - WEBUI: Allow to specify file indexes in torrents/files API (glassez)
+    - WINDOWS: NSIS: Allow more strings to translated (bovirus, Chocobo1)
+    - WINDOWS: NSIS: Update Italian, German, Estonian, Russian, PortugueseBR translations (bovirus, Henry Water, PriitUring, Долматов Алексей, Felipe)
+    - LINUX: Fix D-Bus Notification `desktop-entry` field (Chocobo1)
+    - MACOS: Don't use executable name as CFBundleName value (Nick Korotysh)
+    - OTHER: Lower Qt requirement to 5.11 (sledgehammer999)
+    - OTHER: Clarify that the license is GPLv2+ (sledgehammer999)
+
+Wed Mar 24 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4.1
+    - BUGFIX: Correctly draw progress bar (glassez)
+    - WEBUI: Fix javascript code which broke the UI (Chocobo1)
+
+Tue Mar 23 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4
+    - FEATURE: Add ability to prioritize selected items by shown file order (Chocobo1)
+    - FEATURE: Allow tab to escape the text box in "Edit trackers" dialog (Christoph Rackwitz)
+    - FEATURE: Support sub-sorting in Transferlist (jagannatharjun)
+    - FEATURE: Expose ToS setting from libtorrent (Chocobo1)
+    - FEATURE: Improve tracker entries handling (glassez)
+    - BUGFIX: Drop extension from generated content folder name (glassez)
+    - BUGFIX: Change qBittorrent Updater window title (xavier2k6)
+    - BUGFIX: Validate HTTPS Tracker Certificate by default (an0n666)
+    - BUGFIX: Don't let "program update" dialog steal focus (Chocobo1)
+    - BUGFIX: Disable expand on double click in TorrentContentTreeView (jagannatharjun)
+    - BUGFIX: Add hyperlink to Transifex on translator list (Si Yong Kim)
+    - BUGFIX: Enlarge "speed limit" icon slightly (Chocobo1)
+    - BUGFIX: Don't prevent system sleep due to errored torrents (dyumin)
+    - BUGFIX: Use stable sorting in transfer list (Chocobo1)
+    - BUGFIX: Allow "missing files" torrents to save more resume data (glassez)
+    - BUGFIX: Restart "missing files" torrents after changing location (glassez)
+    - BUGFIX: Show proper string when torrent availability is not available (Chocobo1)
+    - BUGFIX: Apply "Hide zero/infinity values" to "Time Active", "Down/Up Limit" and ETA columns (Chocobo1)
+    - BUGFIX: Fix potential out-of-bounds access (Chocobo1)
+    - BUGFIX: Make SpeedPlotView averager time aware (jagannatharjun)
+    - BUGFIX: Add a 3-Hour graph (jagannatharjun)
+    - BUGFIX: Add an option to disable icons in menus (always disabled on MacOS) (Michał Kopeć)
+    - BUGFIX: Improve detection of filename extension of audio/video files (Chocobo1)
+    - BUGFIX: Various drawing improvements of progress bar (Chocobo1)
+    - BUGFIX: Properly stop torrent creation if aborted (Chocobo1)
+    - BUGFIX: Replace external program parameters in one step (Chocobo1)
+    - BUGFIX: Improve "save resume data" handling (glassez)
+    - BUGFIX: Fix bad IPv6 address format for outgoingInterfaces (treysis)
+    - WEBUI: Properly decode strings (brvphoenix)
+    - WEBUI: Accept "share limits" when adding torrent using WebAPI (glassez)
+    - WEBUI: Add seeding time to the active time column (thalieht)
+    - WEBUI: Fix incorrect seeding time string in General tab (thalieht)
+    - WEBUI: Allow >100 days in WebUI function "friendlyDuration" (thalieht)
+    - WEBUI: Avoid decoding strings repeatedly (brvphoenix)
+    - RSS: Add category button on AutomatedRSSDownloader on GUI (Si Yong Kim)
+    - WINDOWS: NSIS: Update Czech translation (slrslr)
+    - WINDOWS: NSIS: Update Portuguese BR translation (Alex)
+    - WINDOWS: NSIS: Add Estonian translation (PriitUring)
+    - WINDOWS: Allow change-case-only file renaming (glassez)
+    - LINUX: Systemd: wait for mounting of local filesystems (Juraj Oršulić)
+    - OTHER: Raise minimum libtorrent version to 1.2.12 (glassez)
+    - OTHER: Raise minimum Qt version to 5.12 (glassez)
+
+Tue Jan 19 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.3
+    - FEATURE: New languages: Azerbaijani, Estonian
+    - BUGFIX: Unify global speed dialogs for normal/alternative speeds (thalieht)
+    - BUGFIX: Increase maximum global speed limits ~2 GiB/s (thalieht)
+    - BUGFIX: Save fastresume when setting torrent speed limits (thalieht)
+    - BUGFIX: Group several torrent options into one dialog (thalieht)
+    - BUGFIX: Capitalize locale names (Chocobo1)
+    - BUGFIX: Improve content file/folder names handling (glassez)
+    - BUGFIX: Drop notification about move storage finished or failed (glassez)
+    - BUGFIX: Reload "missing files" torrent instead of re-checking (glassez)
+    - BUGFIX: Remember dialog sizes (Chocobo1)
+    - BUGFIX: Improve detection of file extension string (Chocobo1)
+    - WEBUI: Don't call non-existent elements (glassez)
+    - WEBUI: Update "Keep top-level folder" in WebUI options (thalieht)
+    - MACOS: QMake: Raise minimal macOS target version to 10.14 (glassez)
+    - LINUX: Use legacy 'data' directory only as a fallback (lbilli)
+    - OTHER: Bump project requirement to C++17 (Chocobo1)
+
+Sun Dec 27 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.2
+    - FEATURE: Allow to add root folder to torrent content (glassez)
+    - FEATURE: "HTTPS tracker validation" option is available on all platforms with latest libtorrent (Chocobo1)
+    - FEATURE: Option for supporting internationalized domain names (IDNs) (Chocobo1)
+    - BUGFIX: Fix broken sorting on some columns (Chocobo1)
+    - BUGFIX: Fix availability per file value (Chocobo1)
+    - BUGFIX: Fix status of torrents without metadata (sledgehammer999)
+    - BUGFIX: Don't try to remove folders for a torrent without metadata (sledgehammer999)
+    - BUGFIX: Lift upper limit of "Max concurrent HTTP announces" option (Chocobo1)
+    - BUGFIX: Add links to libtorrent documentation (Chocobo1)
+    - BUGFIX: Move "embedded tracker" options to qbt section (Chocobo1)
+    - BUGFIX: Properly handle "Append extension" option changing (glassez)
+    - BUGFIX: Correctly save paused torrent state (glassez)
+    - BUGFIX: Fix bug of "move storage job" can be performed multiple times (glassez)
+    - WEBUI: Add ability to use 'shift+delete' to delete torrents (Chocobo1)
+    - WEBUI: Allow to attach tags while adding torrents (Jesse Chan)
+    - WEBUI: Bump version to 2.6.2 (Jesse Chan)
+    - WEBUI: Remove unnecessary restriction on input length (Chocobo1)
+    - WINDOWS: NSIS: Update Russian translation (Andrei Stepanov)
+    - WINDOWS:  NSIS: Update Italian translation (Alessandro Simonelli)
+    - OTHER: Drop support for building with libtorrent < 1.2.11 (Vladimir Golovnev)
+
+Wed Nov 25 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.1
+    - FEATURE: Allow progress bar styling from custom themes (jagannatharjun)
+    - FEATURE: Allow adding torrents using "Paste" key sequence (Chocobo1)
+    - FEATURE: Add Latgalian translation (sledgehammer999)
+    - BUGFIX: Prevent resume data to be saved for removed torrent (glassez)
+    - BUGFIX: Clarify connection protocol choice label (FranciscoPombal)
+    - BUGFIX: Fix crash when clicked outside the table of torrent content view (jagannatharjun)
+    - BUGFIX: Don't resume "paused" torrents when put into "checking" state by libtorrent (glassez)
+    - BUGFIX: Fix torrent state calculation (glassez)
+    - BUGFIX: Align integer data to right in torrent content view (jagannatharjun)
+    - WEBUI: Place WebUI RSS description in sandboxed iframe (Sepro)
+    - WEBUI: Avoid settings being reset via WebAPI (Chocobo1)
+    - WEBUI: Fix toggling advanced option in WebUI (thalieht)
+    - WEBUI: Expose contentPath in WebAPI torrents/info (FranciscoPombal)
+    - WEBUI: Fix the issue that IPv6 address can't be banned (brvphoenix)
+    - RSS: Fix confusion in date format description (Thomas De Rocker)
+    - WINDOWS: Update dutch.nsi (Thomas De Rocker)
+    - LINUX: Update .desktop file translations (sledgehammer999)
+
+Thu Oct 22 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0.1
+    - WINDOWS: NSIS: Update Italian translation (bovirus)
 
 Sun Oct 18 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0
     - FEATURE: Many UI elements colors are themeable now (jagannatharjun)

INSTALL

@@ -5,22 +5,20 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - Boost >= 1.65
 
-  - libtorrent-rasterbar 1.2.14 - 1.2.x || 2.0.4 - 2.0.x
-      * By Arvid Norberg, https://www.libtorrent.org/
+  - libtorrent-rasterbar >= 1.2.12 (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.15.2 - 5.x
+  - Qt >= 5.12
 
   - 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, run-time only
-      * Used by the bundled search engine
+  - Python >= 3.5.0 (optional, runtime only)
+      * Required by the internal 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.

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -17,7 +17,7 @@ macro(qbt_common_config)
     )
 
     target_compile_definitions(qbt_common_cfg INTERFACE
-        QT_DISABLE_DEPRECATED_BEFORE=0x050f02
+        QT_DEPRECATED_WARNINGS
         QT_NO_CAST_TO_ASCII
         QT_NO_CAST_FROM_BYTEARRAY
         QT_USE_QSTRINGBUILDER
@@ -37,7 +37,7 @@ macro(qbt_common_config)
         )
     endif()
 
-    if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
+    if ((CXX_COMPILER_ID STREQUAL "GNU") OR (CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
         target_compile_options(qbt_common_cfg INTERFACE
             -Wall
             -Wextra
@@ -59,7 +59,7 @@ macro(qbt_common_config)
         endif()
     endif()
 
-    if ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
+    if ((CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
         target_compile_options(qbt_common_cfg INTERFACE
             -Wno-range-loop-analysis
         )
@@ -79,8 +79,6 @@ 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
@@ -90,7 +88,4 @@ 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,9 +45,6 @@ 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,5 +1,4 @@
-
-AC_INIT([qbittorrent], [v4.4.0alpha], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.3.9], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}
@@ -54,32 +53,17 @@ AC_ARG_ENABLE(qt-dbus,
               [enable_qt_dbus=yes])
 
 # Detect OS
-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 FreeBSD])
+AS_IF([expr "$host_os" : ".*freebsd.*" > /dev/null],
+      [AC_MSG_RESULT([yes])
+      LIBS="-lexecinfo $LIBS"],
+      [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
+AC_MSG_CHECKING([whether OS is macOS])
+AS_IF([expr "$host_os" : ".*darwin.*" > /dev/null],
+      [AC_MSG_RESULT([yes])
+      enable_qt_dbus=no],
+      [AC_MSG_RESULT([no])])
 
 # Require 0.23 pkg-config
 PKG_PROG_PKG_CONFIG([0.23])
@@ -157,7 +141,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.15.2])
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.11])
       ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
@@ -191,12 +175,14 @@ 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 >= 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"])])
+                  [libtorrent-rasterbar >= 1.2.12],
+                  [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
+                  LIBS="$libtorrent_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(openssl,
                   [openssl >= 1.1.1],
@@ -230,7 +216,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++17"
+                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
                                             AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
                                            [AC_MSG_RESULT([yes])
                                             AC_MSG_ERROR([The compiler supports C++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.4.0</string>
+	<string>4.3.9</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>

dist/unix/CMakeLists.txt

@@ -30,6 +30,12 @@ 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
@@ -40,11 +46,6 @@ 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

@@ -1,16 +0,0 @@
-<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.4.0" date="2020-10-18"/>
+    <release version="4.3.9" date="2021-10-31"/>
   </releases>
 </component>

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

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

dist/windows/options.nsi

@@ -28,7 +28,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.4.0"
+!define PROG_VERSION "4.3.9"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun

m4/ax_boost_system.m4

@@ -0,0 +1,121 @@
+# ===========================================================================
+#     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,60 +1,29 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# 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.
 
-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.
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
 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)))?$])
@@ -76,19 +45,18 @@ if test -n "$PKG_CONFIG"; then
 		PKG_CONFIG=""
 	fi
 fi[]dnl
-])dnl PKG_PROG_PKG_CONFIG
+])# PKG_PROG_PKG_CONFIG
 
-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
+# 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
+# --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -98,10 +66,8 @@ m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
-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.
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
 m4_define([_PKG_CONFIG],
 [if test -n "$$1"; then
     pkg_cv_[]$1="$$1"
@@ -113,11 +79,10 @@ m4_define([_PKG_CONFIG],
  else
     pkg_failed=untried
 fi[]dnl
-])dnl _PKG_CONFIG
+])# _PKG_CONFIG
 
-dnl _PKG_SHORT_ERRORS_SUPPORTED
-dnl ---------------------------
-dnl Internal check to see if pkg-config supports short errors.
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -125,24 +90,26 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 else
         _pkg_short_errors_supported=no
 fi[]dnl
-])dnl _PKG_SHORT_ERRORS_SUPPORTED
+])# _PKG_SHORT_ERRORS_SUPPORTED
 
 
-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
+# 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
+#
+#
+# --------------------------------------------------------------
 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 $2])
+AC_MSG_CHECKING([for $1])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -152,7 +119,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
@@ -173,7 +140,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
+     	AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -189,40 +156,16 @@ else
         AC_MSG_RESULT([yes])
 	$3
 fi[]dnl
-])dnl PKG_CHECK_MODULES
+])# PKG_CHECK_MODULES
 
 
-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.
+# 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.
 AC_DEFUN([PKG_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -233,18 +176,16 @@ AC_ARG_WITH([pkgconfigdir],
 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
 m4_popdef([pkg_default])
 m4_popdef([pkg_description])
-])dnl PKG_INSTALLDIR
+]) dnl PKG_INSTALLDIR
 
 
-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.
+# 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.
 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
 m4_pushdef([pkg_description],
@@ -255,15 +196,13 @@ 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
 
 
-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.
+# 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.
 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
@@ -272,4 +211,4 @@ _PKG_CONFIG([$1], [variable="][$3]["], [$2])
 AS_VAR_COPY([$1], [pkg_cv_][$1])
 
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])dnl PKG_CHECK_VAR
+])# 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.15.2],
+[PKG_CHECK_EXISTS([Qt5Core >= 5.11],
                  [PKG_CHECK_VAR(QT_QMAKE,
-                                [Qt5Core >= 5.15.2],
+                                [Qt5Core >= 5.11],
                                 [host_bins])
                  ])
 
@@ -18,7 +18,7 @@ AS_IF([test -f "$QT_QMAKE/qmake"],
                              [QT_QMAKE=""])
               ])
 
-AC_MSG_CHECKING([for Qt5 qmake >= 5.15.2])
+AC_MSG_CHECKING([for Qt5 qmake >= 5.11])
 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.15.2])
-       PKG_CHECK_EXISTS([Qt5DBus >= 5.15.2],
+       [AC_MSG_CHECKING([for Qt5DBus >= 5.11])
+       PKG_CHECK_EXISTS([Qt5DBus >= 5.11],
                         [AC_MSG_RESULT([found])
                          HAVE_QTDBUS=[true]],
                         [AC_MSG_RESULT([not found])

src/CMakeLists.txt

@@ -1,66 +1,47 @@
-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(LibtorrentRasterbar IMPORTED_TARGET GLOBAL "libtorrent-rasterbar>=${version}")
-            if (NOT LibtorrentRasterbar_FOUND)
-                message(
-                    FATAL_ERROR
-                    "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"
-                    " file in your system's pkg-config search paths (use the system environment variable PKG_CONFIG_PATH"
-                    " to specify additional search paths if needed)."
-                )
-            endif()
-            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 >= ${version})"
+if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
+    find_package(LibtorrentRasterbar QUIET ${minLibtorrentVersion} 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)
+            message(
+                FATAL_ERROR
+                "Package LibtorrentRasterbar >= ${minLibtorrentVersion} 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"
+                " file in your system's pkg-config search paths (use the system environment variable PKG_CONFIG_PATH"
+                " to specify additional search paths if needed)."
             )
-            set_package_properties("LibtorrentRasterbar via pkg-config (version >= ${version})"
-                PROPERTIES
-                TYPE REQUIRED
-            )
-        else()
-            set_package_properties(LibtorrentRasterbar PROPERTIES TYPE REQUIRED)
         endif()
+        add_library(LibtorrentRasterbar::torrent-rasterbar ALIAS PkgConfig::LIBTORRENT_RASTERBAR)
+        # force a fake package to show up in the feature summary
+        set_property(GLOBAL APPEND PROPERTY
+            PACKAGES_FOUND
+            "LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
+        )
+        set_package_properties("LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
+            PROPERTIES
+            TYPE REQUIRED
+        )
     else()
-        find_package(LibtorrentRasterbar ${version} REQUIRED COMPONENTS torrent-rasterbar)
+        set_package_properties(LibtorrentRasterbar PROPERTIES TYPE REQUIRED)
     endif()
-endmacro()
-
-find_libtorrent(${minLibtorrent1Version})
-if (LibtorrentRasterbar_FOUND AND (LibtorrentRasterbar_VERSION VERSION_GREATER_EQUAL 2.0))
-    find_libtorrent(${minLibtorrentVersion})
+else()
+    find_package(LibtorrentRasterbar ${minLibtorrentVersion} REQUIRED COMPONENTS torrent-rasterbar)
 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)
-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()
+find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS Core Network Xml LinguistTools)
+if (DBUS)
+    find_package(Qt5 ${minQtVersion} 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()
 
 # automatically call Qt moc, rcc and uic as needed for all targets by default
@@ -79,15 +60,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(base)
 
 if (GUI)
-    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()
+    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)
     endif()
-
     add_subdirectory(gui)
 endif()
 

src/app/CMakeLists.txt

@@ -4,14 +4,22 @@
 # 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")
-qt_add_translation(QBT_QM_FILES ${QBT_TS_FILES} OPTIONS -silent)
+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()
 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")
-    qt_add_translation(QBT_WEBUI_QM_FILES ${QBT_WEBUI_TS_FILES} OPTIONS -silent)
+    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()
     configure_file("${qBittorrent_SOURCE_DIR}/src/webui/www/translations/webui_translations.qrc"
         "${qBittorrent_BINARY_DIR}/src/webui/www/translations/webui_translations.qrc" COPYONLY)
 endif()
@@ -139,7 +147,11 @@ endif()
 if (GUI)
     target_link_libraries(qbt_app PRIVATE qbt_gui)
     if ((CMAKE_SYSTEM_NAME STREQUAL "Windows") OR (CMAKE_SYSTEM_NAME STREQUAL "Darwin"))
-        qt_import_plugins(qbt_app INCLUDE Qt::QSvgIconPlugin Qt::QSvgPlugin)
+        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()
     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"
@@ -141,9 +141,7 @@ 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
@@ -304,7 +302,7 @@ void Application::setFileLoggerAgeType(const int value)
 
 void Application::processMessage(const QString &message)
 {
-    const QStringList params = message.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts);
+    const QStringList params = message.split(PARAMS_SEPARATOR, QString::SkipEmptyParts);
     // If Application is not running (i.e., other
     // components are not ready) store params
     if (m_running)
@@ -352,15 +350,13 @@ void Application::runExternalProgram(const BitTorrent::Torrent *torrent) const
 #endif
             break;
         case u'G':
-            program.replace(i, 2, torrent->tags().join(QLatin1String(",")));
+            {
+                QStringList tags = torrent->tags().values();
+                std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
+                program.replace(i, 2, tags.join(','));
+            }
             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':
@@ -437,12 +433,16 @@ 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 +563,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@addPaused=")))
         {
-            torrentParams.addPaused = (QStringView(param).mid(11).toInt() != 0);
+            torrentParams.addPaused = (param.midRef(11).toInt() != 0);
             continue;
         }
 
@@ -593,7 +593,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@skipDialog=")))
         {
-            skipTorrentDialog = (QStringView(param).mid(12).toInt() != 0);
+            skipTorrentDialog = (param.midRef(12).toInt() != 0);
             continue;
         }
 
@@ -667,8 +667,8 @@ int Application::exec(const QStringList &params)
     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 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';
+            + tr("The Web UI administrator password is still the default one: %1").arg("adminadmin") + '\n'
+            + tr("This is a security risk, please consider changing your password from program preferences.") + '\n';
         printf("%s", qUtf8Printable(warning));
     }
 #endif // DISABLE_WEBUI

src/app/application.h

@@ -71,7 +71,7 @@ namespace RSS
 class Application final : public BaseApplication
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(Application)
+    Q_DISABLE_COPY(Application)
 
 public:
     Application(int &argc, char **argv);

src/app/applicationinstancemanager.h

@@ -35,7 +35,7 @@ class QtLocalPeer;
 class ApplicationInstanceManager : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(ApplicationInstanceManager)
+    Q_DISABLE_COPY(ApplicationInstanceManager)
 
 public:
     explicit ApplicationInstanceManager(const QString &appId, QObject *parent = nullptr);

src/app/cmdoptions.cpp

@@ -526,55 +526,55 @@ QString makeUsage(const QString &prgName)
     QTextStream stream(&text, QIODevice::WriteOnly);
     QString indentation = QString(USAGE_INDENTATION, ' ');
 
-    stream << QObject::tr("Usage:") << '\n'
-        << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n'
+    stream << QObject::tr("Usage:") << '\n';
+    stream << indentation << prgName << QLatin1String(" [options] [(<filename> | <url>)...]") << '\n';
 
-        << QObject::tr("Options:") << '\n'
+    stream << QObject::tr("Options:") << '\n';
 #if !defined(Q_OS_WIN) || defined(DISABLE_GUI)
-        << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n'
+    stream << SHOW_VERSION_OPTION.usage() << wrapText(QObject::tr("Display program version and exit")) << '\n';
 #endif
-        << 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'
+    stream << SHOW_HELP_OPTION.usage() << wrapText(QObject::tr("Display this help message and exit")) << '\n';
+    stream << WEBUI_PORT_OPTION.usage(QObject::tr("port"))
+           << wrapText(QObject::tr("Change the Web UI port"))
+           << '\n';
 #ifndef DISABLE_GUI
-        << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n'
+    stream << NO_SPLASH_OPTION.usage() << wrapText(QObject::tr("Disable splash screen")) << '\n';
 #elif !defined(Q_OS_WIN)
-        << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n'
+    stream << DAEMON_OPTION.usage() << wrapText(QObject::tr("Run in daemon-mode (background)")) << '\n';
 #endif
     //: Use appropriate short form or abbreviation of "directory"
-        << 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'
-        << Option::padUsageText(QObject::tr("files or URLs"))
-        << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n'
-        << '\n'
+    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()
+           << 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"))
+           << wrapText(QObject::tr("Download the torrents passed by the user")) << '\n'
+           << '\n';
 
-        << 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'
-        << 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'
-        << '\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("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()
+           << wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a "
+                                   "torrent.")) << '\n';
+    stream << '\n';
 
-        << 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"
-        << QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n'
-        << wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n';
+    stream << 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"
+           << QLatin1String("QBT_NO_SPLASH=1 ") << prgName << '\n'
+           << wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) << '\n';
 
     return text;
 }

src/app/filelogger.cpp

@@ -126,9 +126,7 @@ 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)
     {
@@ -179,7 +177,7 @@ void FileLogger::openLogFile()
 {
     if (!m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)
         || !m_logFile.setPermissions(QFile::ReadOwner | QFile::WriteOwner))
-    {
+        {
         m_logFile.close();
         LogMsg(tr("An error occurred while trying to open the log file. Logging to file is disabled."), Log::CRITICAL);
     }

src/app/filelogger.h

@@ -40,7 +40,7 @@ namespace Log
 class FileLogger : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(FileLogger)
+    Q_DISABLE_COPY(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 (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && !defined(DISABLE_GUI)
+#if !defined(DISABLE_GUI) && (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     // 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);
@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
         // 3. https://bugreports.qt.io/browse/QTBUG-46015
 
         qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && !defined(DISABLE_GUI)
+#if !defined(DISABLE_GUI)
         // this is the default in Qt6
         app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif

src/app/qtlocalpeer/qtlocalpeer.cpp

@@ -79,7 +79,6 @@
 #include <QDir>
 #include <QLocalServer>
 #include <QLocalSocket>
-#include <QRegularExpression>
 
 #include "base/utils/misc.h"
 
@@ -109,7 +108,7 @@ QtLocalPeer::QtLocalPeer(QObject *parent, const QString &appId)
 #endif
         prefix = id.section(QLatin1Char('/'), -1);
     }
-    prefix.remove(QRegularExpression("[^a-zA-Z]"));
+    prefix.remove(QRegExp("[^a-zA-Z]"));
     prefix.truncate(6);
 
     QByteArray idc = id.toUtf8();

src/app/qtlocalpeer/qtlockedfile_win.cpp

@@ -89,7 +89,7 @@ Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
 
     Qt::HANDLE mutex;
     if (doCreate) {
-        QT_WA( { mutex = CreateMutexW(NULL, FALSE, reinterpret_cast<const TCHAR *>(mname.utf16())); },
+        QT_WA( { mutex = CreateMutexW(NULL, FALSE, (TCHAR*)mname.utf16()); },
                { mutex = CreateMutexA(NULL, FALSE, mname.toLocal8Bit().constData()); } );
         if (!mutex) {
             qErrnoWarning("QtLockedFile::lock(): CreateMutex failed");
@@ -97,7 +97,7 @@ Qt::HANDLE QtLockedFile::getMutexHandle(int idx, bool doCreate)
         }
     }
     else {
-        QT_WA( { mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, reinterpret_cast<const TCHAR *>(mname.utf16())); },
+        QT_WA( { mutex = OpenMutexW(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, (TCHAR*)mname.utf16()); },
                { mutex = OpenMutexA(SYNCHRONIZE | MUTEX_MODIFY_STATE, FALSE, mname.toLocal8Bit().constData()); } );
         if (!mutex) {
             if (GetLastError() != ERROR_FILE_NOT_FOUND)

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)
-    auto params = static_cast<QStringList *>(user);
+    QStringList* params = (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;
-    auto context = static_cast<EnumModulesContext *>(UserContext);
+    EnumModulesContext* context = (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)];
-    auto pSymbol = reinterpret_cast<PSYMBOL_INFO>(buffer);
+    PSYMBOL_INFO pSymbol = (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_MOVE(StacktraceDialog)
+    Q_DISABLE_COPY(StacktraceDialog)
 
 public:
     explicit StacktraceDialog(QWidget *parent = nullptr);

src/app/upgrade.cpp

@@ -28,6 +28,7 @@
 
 #include "upgrade.h"
 
+#include <QFile>
 #include <QMetaEnum>
 #include <QVector>
 
@@ -36,7 +37,6 @@
 #include "base/profile.h"
 #include "base/settingsstorage.h"
 #include "base/utils/fs.h"
-#include "base/utils/io.h"
 #include "base/utils/string.h"
 
 namespace
@@ -53,10 +53,17 @@ namespace
             if (!newData.isEmpty() || oldData.isEmpty())
                 return;
 
-            const nonstd::expected<void, QString> result = Utils::IO::saveToFile(savePath, oldData);
-            if (!result)
+            QFile file(savePath);
+            if (!file.open(QIODevice::WriteOnly))
             {
-                LogMsg(errorMsgFormat.arg(savePath, result.error()) , Log::WARNING);
+                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);
                 return;
             }
 
@@ -95,28 +102,12 @@ 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);
-        }
-    }
 }
 
 bool upgrade(const bool /*ask*/)
 {
     exportWebUIHttpsFiles();
     upgradeTorrentContentLayout();
-    upgradeListenPortSettings();
     return true;
 }
 

src/base/CMakeLists.txt

@@ -1,30 +1,26 @@
 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/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/lttypecast.h
+    bittorrent/ltunderlyingtype.h
     bittorrent/magneturi.h
     bittorrent/nativesessionextension.h
     bittorrent/nativetorrentextension.h
     bittorrent/peeraddress.h
     bittorrent/peerinfo.h
     bittorrent/portforwarderimpl.h
-    bittorrent/resumedatastorage.h
+    bittorrent/resumedatasavingmanager.h
     bittorrent/session.h
     bittorrent/sessionstatus.h
     bittorrent/speedmonitor.h
@@ -59,7 +55,6 @@ add_library(qbt_base STATIC
     net/proxyconfigurationmanager.h
     net/reverseresolution.h
     net/smtp.h
-    orderedset.h
     preferences.h
     profile.h
     profile_p.h
@@ -75,14 +70,12 @@ 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
@@ -99,9 +92,7 @@ add_library(qbt_base STATIC
     asyncfilestorage.cpp
     bittorrent/abstractfilestorage.cpp
     bittorrent/bandwidthscheduler.cpp
-    bittorrent/bencoderesumedatastorage.cpp
     bittorrent/customstorage.cpp
-    bittorrent/dbresumedatastorage.cpp
     bittorrent/downloadpriority.cpp
     bittorrent/filesearcher.cpp
     bittorrent/filterparserthread.cpp
@@ -112,6 +103,7 @@ 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
@@ -154,12 +146,10 @@ 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
@@ -177,7 +167,7 @@ target_link_libraries(qbt_base
         ZLIB::ZLIB
     PUBLIC
         LibtorrentRasterbar::torrent-rasterbar
-        Qt::Core Qt::Network Qt::Sql Qt::Xml
+        Qt5::Core Qt5::Network Qt5::Xml
         qbt_common_cfg
 )
 
@@ -204,5 +194,5 @@ if (NOT WEBUI)
 endif()
 
 if (DBUS)
-    target_link_libraries(qbt_base PUBLIC Qt::DBus)
+    target_link_libraries(qbt_base PUBLIC Qt5::DBus)
 endif()

src/base/algorithm.h

@@ -44,7 +44,7 @@ namespace Algorithm
     {
     };
 
-    // To be used with associative array types, such as QMap, QHash and its variants
+    // To be used with associative array types, such as QMap, QHash and it's 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,8 +30,7 @@
 
 #include <QDebug>
 #include <QMetaObject>
-
-#include "base/utils/io.h"
+#include <QSaveFile>
 
 AsyncFileStorage::AsyncFileStorage(const QString &storageFolderPath, QObject *parent)
     : QObject(parent)
@@ -68,12 +67,15 @@ 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;
-
-    const nonstd::expected<void, QString> result = Utils::IO::saveToFile(filePath, data);
-    if (!result)
+    if (file.open(QIODevice::WriteOnly))
     {
-        qDebug() << "AsyncFileStorage: Failed to save data";
-        emit failed(filePath, result.error());
+        file.write(data);
+        if (!file.commit())
+        {
+            qDebug() << "AsyncFileStorage: Failed to save data";
+            emit failed(filePath, file.errorString());
+        }
     }
 }

src/base/asyncfilestorage.h

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

src/base/base.pri

@@ -1,29 +1,25 @@
 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/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/lttypecast.h \
+    $$PWD/bittorrent/ltunderlyingtype.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/resumedatastorage.h \
+    $$PWD/bittorrent/resumedatasavingmanager.h \
     $$PWD/bittorrent/session.h \
     $$PWD/bittorrent/sessionstatus.h \
     $$PWD/bittorrent/speedmonitor.h \
@@ -58,7 +54,6 @@ 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 \
@@ -75,14 +70,12 @@ 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 \
@@ -99,9 +92,7 @@ SOURCES += \
     $$PWD/asyncfilestorage.cpp \
     $$PWD/bittorrent/abstractfilestorage.cpp \
     $$PWD/bittorrent/bandwidthscheduler.cpp \
-    $$PWD/bittorrent/bencoderesumedatastorage.cpp \
     $$PWD/bittorrent/customstorage.cpp \
-    $$PWD/bittorrent/dbresumedatastorage.cpp \
     $$PWD/bittorrent/downloadpriority.cpp \
     $$PWD/bittorrent/filesearcher.cpp \
     $$PWD/bittorrent/filterparserthread.cpp \
@@ -112,6 +103,7 @@ 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 \
@@ -154,12 +146,10 @@ 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,6 +44,7 @@ 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,7 +46,7 @@ namespace BitTorrent
     {
         QString name;
         QString category;
-        TagSet tags;
+        QSet<QString> tags;
         QString savePath;
         bool disableTempPath = false; // e.g. for imported torrents
         bool sequential = false;

src/base/bittorrent/bandwidthscheduler.h

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

src/base/bittorrent/bencoderesumedatastorage.cpp

@@ -1,397 +0,0 @@
-/*
- * 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.savePath = Profile::instance()->fromPortablePath(
-                Utils::Fs::toUniformPath(fromLTString(root.dict_find_string_value("qBt-savePath"))));
-    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);
-
-    // 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-savePath"] = Profile::instance()->toPortablePath(resumeData.savePath).toStdString();
-    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;
-
-    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

@@ -1,67 +0,0 @@
-/*
- * 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/customstorage.cpp

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

src/base/bittorrent/customstorage.h

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

src/base/bittorrent/dbresumedatastorage.cpp

@@ -1,591 +0,0 @@
-/*
- * 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 <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 = 1;
-
-    const char DB_TABLE_META[] = "meta";
-    const char DB_TABLE_TORRENTS[] = "torrents";
-
-    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_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(',')));
-    }
-
-    QString makeInsertStatement(const QString &tableName, const QVector<Column> &columns)
-    {
-        QStringList names;
-        names.reserve(columns.size());
-        QStringList values;
-        values.reserve(columns.size());
-        for (const Column &column : columns)
-        {
-            names.append(quoted(column.name));
-            values.append(column.placeholder);
-        }
-
-        const QString jointNames = names.join(QLatin1Char(','));
-        const QString jointValues = values.join(QLatin1Char(','));
-
-        return QString::fromLatin1("INSERT INTO %1 (%2) VALUES (%3)")
-                .arg(quoted(tableName), jointNames, jointValues);
-    }
-
-    QString makeOnConflictUpdateStatement(const Column &constraint, const QVector<Column> &columns)
-    {
-        QStringList names;
-        names.reserve(columns.size());
-        QStringList values;
-        values.reserve(columns.size());
-        for (const Column &column : columns)
-        {
-            names.append(quoted(column.name));
-            values.append(column.placeholder);
-        }
-
-        const QString jointNames = names.join(QLatin1Char(','));
-        const QString jointValues = values.join(QLatin1Char(','));
-
-        return QString::fromLatin1(" ON CONFLICT (%1) DO UPDATE SET (%2) = (%3)")
-                .arg(quoted(constraint.name), jointNames, jointValues);
-    }
-
-    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();
-
-    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.savePath = Profile::instance()->fromPortablePath(
-                Utils::Fs::toUniformPath(query.value(DB_COLUMN_TARGET_SAVE_PATH.name).toString()));
-    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();
-
-    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);
-
-    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);
-    });
-}
-
-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("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;
-    }
-}
-
-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_TARGET_SAVE_PATH.placeholder, Profile::instance()->toPortablePath(resumeData.savePath));
-        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);
-        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

@@ -1,60 +0,0 @@
-/*
- * 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:
-        void createDB() const;
-
-        QThread *m_ioThread = nullptr;
-
-        class Worker;
-        Worker *m_asyncWorker = nullptr;
-    };
-}

src/base/bittorrent/filesearcher.h

@@ -38,7 +38,7 @@ namespace BitTorrent
 class FileSearcher final : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(FileSearcher)
+    Q_DISABLE_COPY(FileSearcher)
 
 public:
     FileSearcher() = default;

src/base/bittorrent/infohash.cpp

@@ -41,27 +41,9 @@ bool BitTorrent::InfoHash::isValid() const
     return m_valid;
 }
 
-SHA1Hash BitTorrent::InfoHash::v1() const
-{
-#ifdef QBT_USES_LIBTORRENT2
-    return (m_nativeHash.has_v1() ? SHA1Hash(m_nativeHash.v1) : SHA1Hash());
-#else
-    return {m_nativeHash};
-#endif
-}
-
-SHA256Hash BitTorrent::InfoHash::v2() const
-{
-#ifdef QBT_USES_LIBTORRENT2
-    return (m_nativeHash.has_v2() ? SHA256Hash(m_nativeHash.v2) : SHA256Hash());
-#else
-    return {};
-#endif
-}
-
 BitTorrent::TorrentID BitTorrent::InfoHash::toTorrentID() const
 {
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     return m_nativeHash.get_best();
 #else
     return {m_nativeHash};

src/base/bittorrent/infohash.h

@@ -28,7 +28,8 @@
 
 #pragma once
 
-#ifdef QBT_USES_LIBTORRENT2
+#include <libtorrent/version.hpp>
+#if (LIBTORRENT_VERSION_NUM >= 20000)
 #include <libtorrent/info_hash.hpp>
 #endif
 
@@ -57,7 +58,7 @@ namespace BitTorrent
     class InfoHash
     {
     public:
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
         using WrappedType = lt::info_hash_t;
 #else
         using WrappedType = lt::sha1_hash;
@@ -68,8 +69,6 @@ namespace BitTorrent
         InfoHash(const WrappedType &nativeHash);
 
         bool isValid() const;
-        SHA1Hash v1() const;
-        SHA256Hash v2() const;
         TorrentID toTorrentID() const;
 
         operator WrappedType() const;

src/base/bittorrent/loadtorrentparams.h

@@ -1,60 +0,0 @@
-/*
- * 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 <libtorrent/add_torrent_params.hpp>
-
-#include <QString>
-
-#include "base/tagset.h"
-#include "torrent.h"
-#include "torrentcontentlayout.h"
-
-namespace BitTorrent
-{
-    struct LoadTorrentParams
-    {
-        lt::add_torrent_params ltAddTorrentParams {};
-
-        QString name;
-        QString category;
-        TagSet tags;
-        QString savePath;
-        TorrentContentLayout contentLayout = TorrentContentLayout::Original;
-        TorrentOperatingMode operatingMode = TorrentOperatingMode::AutoManaged;
-        bool firstLastPiecePriority = false;
-        bool hasSeedStatus = false;
-        bool stopped = false;
-
-        qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
-        int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
-
-        bool restored = false;  // is existing torrent job?
-    };
-}

src/base/bittorrent/lttypecast.h

@@ -1,52 +0,0 @@
-/*
- * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2019, 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 <libtorrent/download_priority.hpp>
-
-#include "downloadpriority.h"
-
-namespace BitTorrent::LT
-{
-    template <typename T>
-    constexpr typename T::underlying_type toUnderlyingType(const T &t) noexcept
-    {
-        return static_cast<typename T::underlying_type>(t);
-    }
-
-    constexpr lt::download_priority_t toNative(const DownloadPriority priority) noexcept
-    {
-        return static_cast<lt::download_priority_t>(static_cast<lt::download_priority_t::underlying_type>(priority));
-    }
-
-    constexpr DownloadPriority fromNative(const lt::download_priority_t priority) noexcept
-    {
-        return static_cast<DownloadPriority>(toUnderlyingType(priority));
-    }
-}

src/base/bittorrent/ltunderlyingtype.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021  Mike Tzou (Chocobo1)
+ * Copyright (C) 2019  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
@@ -26,12 +26,33 @@
  * exception statement from your version.
  */
 
-#include "tagset.h"
+#pragma once
 
-bool TagLessThan::operator()(const QString &left, const QString &right) const
+#include <type_traits>
+
+template <typename T, typename = void>
+struct HasUnderlyingType
+    : std::false_type
 {
-    const int result = m_compare(left, right);
-    if (result != 0)
-        return (result < 0);
-    return (m_subCompare(left, right) < 0);
-}
+};
+
+template <typename T>
+struct HasUnderlyingType<T, std::void_t<typename T::underlying_type>>
+    : std::true_type
+{
+};
+
+template <typename T, typename = void>
+struct LTUnderlying
+{
+    using type = T;
+};
+
+template <typename T>
+struct LTUnderlying<T, typename std::enable_if_t<HasUnderlyingType<T>::value>>
+{
+    using type = typename T::underlying_type;
+};
+
+template <typename T>
+using LTUnderlyingType = typename LTUnderlying<T>::type;

src/base/bittorrent/magneturi.cpp

@@ -39,34 +39,21 @@
 
 namespace
 {
-    // BEP9 Extension for Peers to Send Metadata Files
-
-    bool isV1Hash(const QString &string)
+    bool isSHA1Hash(const QString &string)
     {
-        // There are 2 representations for BitTorrent v1 info hash:
+        // There are 2 representations for BitTorrent info hash:
         // 1. 40 chars hex-encoded string
         //      == 20 (SHA-1 length in bytes) * 2 (each byte maps to 2 hex characters)
         // 2. 32 chars Base32 encoded string
         //      == 20 (SHA-1 length in bytes) * 1.6 (the efficiency of Base32 encoding)
-        const int V1_HEX_SIZE = SHA1Hash::length() * 2;
-        const int V1_BASE32_SIZE = SHA1Hash::length() * 1.6;
+        const int SHA1_HEX_SIZE = SHA1Hash::length() * 2;
+        const int SHA1_BASE32_SIZE = SHA1Hash::length() * 1.6;
 
-        return ((((string.size() == V1_HEX_SIZE))
+        return ((((string.size() == SHA1_HEX_SIZE))
                 && !string.contains(QRegularExpression(QLatin1String("[^0-9A-Fa-f]"))))
-            || ((string.size() == V1_BASE32_SIZE)
+            || ((string.size() == SHA1_BASE32_SIZE)
                 && !string.contains(QRegularExpression(QLatin1String("[^2-7A-Za-z]")))));
     }
-
-    bool isV2Hash(const QString &string)
-    {
-        // There are 1 representation for BitTorrent v2 info hash:
-        // 1. 64 chars hex-encoded string
-        //      == 32 (SHA-2 256 length in bytes) * 2 (each byte maps to 2 hex characters)
-        const int V2_HEX_SIZE = SHA256Hash::length() * 2;
-
-        return (string.size() == V2_HEX_SIZE)
-                && !string.contains(QRegularExpression(QLatin1String("[^0-9A-Fa-f]")));
-    }
 }
 
 using namespace BitTorrent;
@@ -79,10 +66,8 @@ MagnetUri::MagnetUri(const QString &source)
 {
     if (source.isEmpty()) return;
 
-    if (isV2Hash(source))
-        m_url = QString::fromLatin1("magnet:?xt=urn:btmh:1220") + source; // 0x12 0x20 is the "multihash format" tag for the SHA-256 hashing scheme.
-    else if (isV1Hash(source))
-        m_url = QString::fromLatin1("magnet:?xt=urn:btih:") + source;
+    if (isSHA1Hash(source))
+        m_url = QLatin1String("magnet:?xt=urn:btih:") + source;
 
     lt::error_code ec;
     lt::parse_magnet_uri(m_url.toStdString(), m_addTorrentParams, ec);
@@ -90,7 +75,7 @@ MagnetUri::MagnetUri(const QString &source)
 
     m_valid = true;
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     m_infoHash = m_addTorrentParams.info_hashes;
 #else
     m_infoHash = m_addTorrentParams.info_hash;

src/base/bittorrent/nativesessionextension.h

@@ -29,10 +29,11 @@
 #pragma once
 
 #include <libtorrent/extensions.hpp>
+#include <libtorrent/version.hpp>
 
 class NativeSessionExtension final : public lt::plugin
 {
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     using ClientData = lt::client_data_t;
 #else
     using ClientData = void *;

src/base/bittorrent/peeraddress.cpp

@@ -32,18 +32,18 @@
 
 using namespace BitTorrent;
 
-PeerAddress PeerAddress::parse(const QStringView address)
+PeerAddress PeerAddress::parse(const QString &address)
 {
-    QList<QStringView> ipPort;
+    QVector<QStringRef> ipPort;
 
-    if (address.startsWith(u'[') && address.contains(QLatin1String("]:")))
+    if (address.startsWith('[') && address.contains("]:"))
     {  // IPv6
-        ipPort = address.split(QString::fromLatin1("]:"));
+        ipPort = address.splitRef("]:");
         ipPort[0] = ipPort[0].mid(1);  // chop '['
     }
-    else if (address.contains(u':'))
+    else if (address.contains(':'))
     {  // IPv4
-        ipPort = address.split(u':');
+        ipPort = address.splitRef(':');
     }
     else
     {

src/base/bittorrent/peeraddress.h

@@ -39,7 +39,7 @@ namespace BitTorrent
         QHostAddress ip;
         ushort port = 0;
 
-        static PeerAddress parse(QStringView address);
+        static PeerAddress parse(const QString &address);
         QString toString() const;
     };
 

src/base/bittorrent/peerinfo.cpp

@@ -257,86 +257,123 @@ qreal PeerInfo::relevance() const
 
 void PeerInfo::determineFlags()
 {
-    const auto updateFlags = [this](const QChar specifier, const QString &explanation)
-    {
-        m_flags += (specifier + QLatin1Char(' '));
-        m_flagsDescription += QString::fromLatin1("%1 = %2\n").arg(specifier, explanation);
-    };
-
     if (isInteresting())
     {
+        // d = Your client wants to download, but peer doesn't want to send (interested and choked)
         if (isRemoteChocked())
         {
-            // d = Your client wants to download, but peer doesn't want to send (interested and choked)
-            updateFlags(QLatin1Char('d'), tr("Interested (local) and choked (peer)"));
+            m_flags += "d ";
+            m_flagsDescription += ("d = "
+                + tr("Interested(local) and Choked(peer)") + '\n');
         }
         else
         {
             // D = Currently downloading (interested and not choked)
-            updateFlags(QLatin1Char('D'), tr("Interested (local) and unchoked (peer)"));
+            m_flags += "D ";
+            m_flagsDescription += ("D = "
+                + tr("interested(local) and unchoked(peer)") + '\n');
         }
     }
 
     if (isRemoteInterested())
     {
+        // u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
         if (isChocked())
         {
-            // u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
-            updateFlags(QLatin1Char('u'), tr("Interested (peer) and choked (local)"));
+            m_flags += "u ";
+            m_flagsDescription += ("u = "
+                + tr("interested(peer) and choked(local)") + '\n');
         }
         else
         {
             // U = Currently uploading (interested and not choked)
-            updateFlags(QLatin1Char('U'), tr("Interested (peer) and unchoked (local)"));
+            m_flags += "U ";
+            m_flagsDescription += ("U = "
+                + tr("interested(peer) and unchoked(local)") + '\n');
         }
     }
 
+    // O = Optimistic unchoke
+    if (optimisticUnchoke())
+    {
+        m_flags += "O ";
+        m_flagsDescription += ("O = " + tr("optimistic unchoke") + '\n');
+    }
+
+    // S = Peer is snubbed
+    if (isSnubbed())
+    {
+        m_flags += "S ";
+        m_flagsDescription += ("S = " + tr("peer snubbed") + '\n');
+    }
+
+    // I = Peer is an incoming connection
+    if (!isLocalConnection())
+    {
+        m_flags += "I ";
+        m_flagsDescription += ("I = " + tr("incoming connection") + '\n');
+    }
+
     // K = Peer is unchoking your client, but your client is not interested
     if (!isRemoteChocked() && !isInteresting())
-        updateFlags(QLatin1Char('K'), tr("Not interested (local) and unchoked (peer)"));
+    {
+        m_flags += "K ";
+        m_flagsDescription += ("K = "
+            + tr("not interested(local) and unchoked(peer)") + '\n');
+    }
 
     // ? = Your client unchoked the peer but the peer is not interested
     if (!isChocked() && !isRemoteInterested())
-        updateFlags(QLatin1Char('?'), tr("Not interested (peer) and unchoked (local)"));
-
-    // O = Optimistic unchoke
-    if (optimisticUnchoke())
-        updateFlags(QLatin1Char('O'), tr("Optimistic unchoke"));
-
-    // S = Peer is snubbed
-    if (isSnubbed())
-        updateFlags(QLatin1Char('S'), tr("Peer snubbed"));
-
-    // I = Peer is an incoming connection
-    if (!isLocalConnection())
-        updateFlags(QLatin1Char('I'), tr("Incoming connection"));
-
-    // H = Peer was obtained through DHT
-    if (fromDHT())
-        updateFlags(QLatin1Char('H'), tr("Peer from DHT"));
+    {
+        m_flags += "? ";
+        m_flagsDescription += ("? = "
+            + tr("not interested(peer) and unchoked(local)") + '\n');
+    }
 
     // X = Peer was included in peerlists obtained through Peer Exchange (PEX)
     if (fromPeX())
-        updateFlags(QLatin1Char('X'), tr("Peer from PEX"));
+    {
+        m_flags += "X ";
+        m_flagsDescription += ("X = " + tr("peer from PEX") + '\n');
+    }
 
-    // L = Peer is local
-    if (fromLSD())
-        updateFlags(QLatin1Char('L'), tr("Peer from LSD"));
+    // H = Peer was obtained through DHT
+    if (fromDHT())
+    {
+        m_flags += "H ";
+        m_flagsDescription += ("H = " + tr("peer from DHT") + '\n');
+    }
 
     // E = Peer is using Protocol Encryption (all traffic)
     if (isRC4Encrypted())
-        updateFlags(QLatin1Char('E'), tr("Encrypted traffic"));
+    {
+        m_flags += "E ";
+        m_flagsDescription += ("E = " + tr("encrypted traffic")  + '\n');
+    }
 
     // e = Peer is using Protocol Encryption (handshake)
     if (isPlaintextEncrypted())
-        updateFlags(QLatin1Char('e'), tr("Encrypted handshake"));
+    {
+        m_flags += "e ";
+        m_flagsDescription += ("e = " + tr("encrypted handshake") + '\n');
+    }
 
     // P = Peer is using uTorrent uTP
     if (useUTPSocket())
-        updateFlags(QLatin1Char('P'), QString::fromUtf8(C_UTP));
+    {
+        m_flags += "P ";
+        m_flagsDescription += ("P = " + QString::fromUtf8(C_UTP) + '\n');
+    }
 
-    m_flags.chop(1);
-    m_flagsDescription.chop(1);
+    // L = Peer is local
+    if (fromLSD())
+    {
+        m_flags += "L ";
+        m_flagsDescription += ("L = " + tr("peer from LSD") + '\n');
+    }
+
+    m_flags = m_flags.trimmed();
+    m_flagsDescription = m_flagsDescription.trimmed();
 }
 
 QString PeerInfo::flags() const

src/base/bittorrent/portforwarderimpl.h

@@ -40,7 +40,7 @@
 class PortForwarderImpl final : public Net::PortForwarder
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(PortForwarderImpl)
+    Q_DISABLE_COPY(PortForwarderImpl)
 
 public:
     explicit PortForwarderImpl(lt::session *provider, QObject *parent = nullptr);

src/base/bittorrent/resumedatasavingmanager.cpp

@@ -0,0 +1,83 @@
+/*
+ * 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 "resumedatasavingmanager.h"
+
+#include <libtorrent/bencode.hpp>
+#include <libtorrent/entry.hpp>
+
+#include <QByteArray>
+#include <QSaveFile>
+
+#include "base/logger.h"
+#include "base/utils/fs.h"
+#include "base/utils/io.h"
+
+ResumeDataSavingManager::ResumeDataSavingManager(const QString &resumeFolderPath)
+    : m_resumeDataDir(resumeFolderPath)
+{
+}
+
+void ResumeDataSavingManager::save(const QString &filename, const QByteArray &data) const
+{
+    const QString filepath = m_resumeDataDir.absoluteFilePath(filename);
+
+    QSaveFile file {filepath};
+    if (!file.open(QIODevice::WriteOnly) || (file.write(data) != data.size()) || !file.commit())
+    {
+        LogMsg(tr("Couldn't save data to '%1'. Error: %2")
+            .arg(filepath, file.errorString()), Log::CRITICAL);
+    }
+}
+
+void ResumeDataSavingManager::save(const QString &filename, const std::shared_ptr<lt::entry> &data) const
+{
+    const QString filepath = m_resumeDataDir.absoluteFilePath(filename);
+
+    QSaveFile file {filepath};
+    if (!file.open(QIODevice::WriteOnly))
+    {
+        LogMsg(tr("Couldn't save data to '%1'. Error: %2")
+            .arg(filepath, file.errorString()), Log::CRITICAL);
+        return;
+    }
+
+    lt::bencode(Utils::IO::FileDeviceOutputIterator {file}, *data);
+    if ((file.error() != QFileDevice::NoError) || !file.commit())
+    {
+        LogMsg(tr("Couldn't save data to '%1'. Error: %2")
+            .arg(filepath, file.errorString()), Log::CRITICAL);
+    }
+}
+
+void ResumeDataSavingManager::remove(const QString &filename) const
+{
+    const QString filepath = m_resumeDataDir.absoluteFilePath(filename);
+
+    Utils::Fs::forceRemove(filepath);
+}

src/base/bittorrent/resumedatasavingmanager.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021  Mike Tzou (Chocobo1)
+ * 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
@@ -28,22 +28,28 @@
 
 #pragma once
 
-#include <QMetaType>
-#include <QString>
+#include <memory>
 
-#include "base/orderedset.h"
-#include "base/utils/compare.h"
+#include <libtorrent/fwd.hpp>
 
-class TagLessThan
+#include <QDir>
+#include <QObject>
+
+class QByteArray;
+
+class ResumeDataSavingManager : public QObject
 {
+    Q_OBJECT
+    Q_DISABLE_COPY(ResumeDataSavingManager)
+
 public:
-    bool operator()(const QString &left, const QString &right) const;
+    explicit ResumeDataSavingManager(const QString &resumeFolderPath);
+
+public slots:
+    void save(const QString &filename, const QByteArray &data) const;
+    void save(const QString &filename, const std::shared_ptr<lt::entry> &data) const;
+    void remove(const QString &filename) const;
 
 private:
-    Utils::Compare::NaturalCompare<Qt::CaseInsensitive> m_compare;
-    Utils::Compare::NaturalCompare<Qt::CaseSensitive> m_subCompare;
+    const QDir m_resumeDataDir;
 };
-
-using TagSet = OrderedSet<QString, TagLessThan>;
-
-Q_DECLARE_METATYPE(TagSet)

src/base/bittorrent/resumedatastorage.h

@@ -1,55 +0,0 @@
-/*
- * 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 <optional>
-
-#include <QtContainerFwd>
-#include <QObject>
-
-namespace BitTorrent
-{
-    class TorrentID;
-    struct LoadTorrentParams;
-
-    class ResumeDataStorage : public QObject
-    {
-        Q_OBJECT
-        Q_DISABLE_COPY_MOVE(ResumeDataStorage)
-
-    public:
-        using QObject::QObject;
-
-        virtual QVector<TorrentID> registeredTorrents() const = 0;
-        virtual std::optional<LoadTorrentParams> load(const TorrentID &id) const = 0;
-        virtual void store(const TorrentID &id, const LoadTorrentParams &resumeData) const = 0;
-        virtual void remove(const TorrentID &id) const = 0;
-        virtual void storeQueue(const QVector<TorrentID> &queue) const = 0;
-    };
-}

src/base/bittorrent/session.h

@@ -36,6 +36,7 @@
 #include <libtorrent/add_torrent_params.hpp>
 #include <libtorrent/fwd.hpp>
 #include <libtorrent/torrent_handle.hpp>
+#include <libtorrent/version.hpp>
 
 #include <QHash>
 #include <QPointer>
@@ -49,12 +50,10 @@
 #include "cachestatus.h"
 #include "sessionstatus.h"
 #include "torrentinfo.h"
-#include "trackerentry.h"
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+class QFile;
 class QNetworkConfiguration;
 class QNetworkConfigurationManager;
-#endif
 class QString;
 class QThread;
 class QTimer;
@@ -63,6 +62,7 @@ class QUrl;
 class BandwidthScheduler;
 class FileSearcher;
 class FilterParserThread;
+class ResumeDataSavingManager;
 class Statistics;
 
 // These values should remain unchanged when adding new items
@@ -81,6 +81,12 @@ enum DeleteOption
     DeleteTorrentAndFiles
 };
 
+enum TorrentExportFolder
+{
+    Regular,
+    Finished
+};
+
 namespace Net
 {
     struct DownloadResult;
@@ -90,11 +96,11 @@ namespace BitTorrent
 {
     class InfoHash;
     class MagnetUri;
-    class ResumeDataStorage;
     class Torrent;
     class TorrentImpl;
     class Tracker;
     struct LoadTorrentParams;
+    struct TrackerEntry;
 
     enum class MoveStorageMode;
 
@@ -135,13 +141,6 @@ namespace BitTorrent
         };
         Q_ENUM_NS(SeedChokingAlgorithm)
 
-        enum class ResumeDataStorageType
-        {
-            Legacy,
-            SQLite
-        };
-        Q_ENUM_NS(ResumeDataStorageType)
-
 #if defined(Q_OS_WIN)
         enum class OSMemoryPriority : int
         {
@@ -190,7 +189,7 @@ namespace BitTorrent
         {
             int diskBlocksInUse = -1;
             int numBlocksRead = -1;
-#ifndef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM < 20000)
             int numBlocksCacheHits = -1;
 #endif
             int writeJobs = -1;
@@ -204,7 +203,7 @@ namespace BitTorrent
     class Session : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY_MOVE(Session)
+        Q_DISABLE_COPY(Session)
 
     public:
         static void initInstance();
@@ -305,6 +304,8 @@ namespace BitTorrent
         void setSaveResumeDataInterval(int value);
         int port() const;
         void setPort(int port);
+        bool useRandomPort() const;
+        void setUseRandomPort(bool value);
         QString networkInterface() const;
         void setNetworkInterface(const QString &iface);
         QString networkInterfaceName() const;
@@ -363,8 +364,6 @@ namespace BitTorrent
         void setSendBufferLowWatermark(int value);
         int sendBufferWatermarkFactor() const;
         void setSendBufferWatermarkFactor(int value);
-        int connectionSpeed() const;
-        void setConnectionSpeed(int value);
         int socketBacklogSize() const;
         void setSocketBacklogSize(int value);
         bool isAnonymousModeEnabled() const;
@@ -395,9 +394,6 @@ namespace BitTorrent
         void setAnnounceIP(const QString &ip);
         int maxConcurrentHTTPAnnounces() const;
         void setMaxConcurrentHTTPAnnounces(int value);
-        bool isReannounceWhenAddressChangedEnabled() const;
-        void setReannounceWhenAddressChangedEnabled(bool enabled);
-        void reannounceToAllTrackers() const;
         int stopTrackerTimeout() const;
         void setStopTrackerTimeout(int value);
         int maxConnections() const;
@@ -434,8 +430,6 @@ namespace BitTorrent
         void setTrackerFilteringEnabled(bool enabled);
         QStringList bannedIPs() const;
         void setBannedIPs(const QStringList &newList);
-        ResumeDataStorageType resumeDataStorageType() const;
-        void setResumeDataStorageType(ResumeDataStorageType type);
 #if defined(Q_OS_WIN)
         OSMemoryPriority getOSMemoryPriority() const;
         void setOSMemoryPriority(OSMemoryPriority priority);
@@ -550,11 +544,9 @@ namespace BitTorrent
         void handleDownloadFinished(const Net::DownloadResult &result);
         void fileSearchFinished(const TorrentID &id, const QString &savePath, const QStringList &fileNames);
 
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
         // Session reconfiguration triggers
         void networkOnlineStateChanged(bool online);
         void networkConfigurationChange(const QNetworkConfiguration &);
-#endif
 
     private:
         struct MoveStorageJob
@@ -577,6 +569,8 @@ namespace BitTorrent
         bool hasPerTorrentRatioLimit() const;
         bool hasPerTorrentSeedingTimeLimit() const;
 
+        void initResumeFolder();
+
         // Session configuration
         Q_INVOKABLE void configure();
         void configureComponents();
@@ -601,12 +595,13 @@ namespace BitTorrent
         void applyOSMemoryPriority() const;
 #endif
 
+        bool loadTorrentResumeData(const QByteArray &data, const TorrentInfo &metadata, LoadTorrentParams &torrentParams);
         bool loadTorrent(LoadTorrentParams params);
         LoadTorrentParams initLoadTorrentParams(const AddTorrentParams &addTorrentParams);
         bool addTorrent_impl(const std::variant<MagnetUri, TorrentInfo> &source, const AddTorrentParams &addTorrentParams);
 
         void updateSeedingLimitTimer();
-        void exportTorrentFile(const TorrentInfo &torrentInfo, const QString &folderPath, const QString &baseName);
+        void exportTorrentFile(const Torrent *torrent, TorrentExportFolder folder = TorrentExportFolder::Regular);
 
         void handleAlert(const lt::alert *a);
         void dispatchTorrentAlert(const lt::alert *a);
@@ -670,7 +665,6 @@ namespace BitTorrent
         CachedSettingValue<int> m_sendBufferWatermark;
         CachedSettingValue<int> m_sendBufferLowWatermark;
         CachedSettingValue<int> m_sendBufferWatermarkFactor;
-        CachedSettingValue<int> m_connectionSpeed;
         CachedSettingValue<int> m_socketBacklogSize;
         CachedSettingValue<bool> m_isAnonymousModeEnabled;
         CachedSettingValue<bool> m_isQueueingEnabled;
@@ -689,7 +683,6 @@ namespace BitTorrent
         CachedSettingValue<bool> m_includeOverheadInLimits;
         CachedSettingValue<QString> m_announceIP;
         CachedSettingValue<int> m_maxConcurrentHTTPAnnounces;
-        CachedSettingValue<bool> m_isReannounceWhenAddressChangedEnabled;
         CachedSettingValue<int> m_stopTrackerTimeout;
         CachedSettingValue<int> m_maxConnections;
         CachedSettingValue<int> m_maxUploads;
@@ -722,6 +715,7 @@ namespace BitTorrent
         CachedSettingValue<bool> m_isBandwidthSchedulerEnabled;
         CachedSettingValue<int> m_saveResumeDataInterval;
         CachedSettingValue<int> m_port;
+        CachedSettingValue<bool> m_useRandomPort;
         CachedSettingValue<QString> m_networkInterface;
         CachedSettingValue<QString> m_networkInterfaceName;
         CachedSettingValue<QString> m_networkInterfaceAddress;
@@ -745,7 +739,6 @@ namespace BitTorrent
         CachedSettingValue<int> m_peerTurnoverCutoff;
         CachedSettingValue<int> m_peerTurnoverInterval;
         CachedSettingValue<QStringList> m_bannedIPs;
-        CachedSettingValue<ResumeDataStorageType> m_resumeDataStorageType;
 #if defined(Q_OS_WIN)
         CachedSettingValue<OSMemoryPriority> m_OSMemoryPriority;
 #endif
@@ -758,6 +751,8 @@ namespace BitTorrent
         int m_numResumeData = 0;
         int m_extraLimit = 0;
         QVector<TrackerEntry> m_additionalTrackerList;
+        QString m_resumeFolderPath;
+        QFile *m_resumeFolderLock = nullptr;
 
         bool m_refreshEnqueued = false;
         QTimer *m_seedingLimitTimer = nullptr;
@@ -768,9 +763,9 @@ namespace BitTorrent
         QPointer<BandwidthScheduler> m_bwScheduler;
         // Tracker
         QPointer<Tracker> m_tracker;
-
+        // fastresume data writing thread
         QThread *m_ioThread = nullptr;
-        ResumeDataStorage *m_resumeDataStorage = nullptr;
+        ResumeDataSavingManager *m_resumeDataSavingManager = nullptr;
         FileSearcher *m_fileSearcher = nullptr;
 
         QSet<TorrentID> m_downloadedMetadata;
@@ -792,14 +787,11 @@ namespace BitTorrent
 
         SessionStatus m_status;
         CacheStatus m_cacheStatus;
-#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+
         QNetworkConfigurationManager *m_networkManager = nullptr;
-#endif
 
         QList<MoveStorageJob> m_moveStorageQueue;
 
-        QString m_lastExternalIP;
-
         static Session *m_instance;
     };
 }

src/base/bittorrent/speedmonitor.h

@@ -38,30 +38,34 @@
 template<typename T>
 struct Sample
 {
-    constexpr Sample() = default;
-
-    constexpr Sample(const T dl, const T ul)
-        : download {dl}
-        , upload {ul}
+    Sample()
+        : download()
+        , upload()
     {
     }
 
-    constexpr Sample<T> &operator+=(const Sample<T> &other)
+    Sample(T dl, T ul)
+        : download(dl)
+        , upload(ul)
+    {
+    }
+
+    Sample<T> &operator+=(const Sample<T> &other)
     {
         download += other.download;
-        upload += other.upload;
+        upload   += other.upload;
         return *this;
     }
 
-    constexpr Sample<T> &operator-=(const Sample<T> &other)
+    Sample<T> &operator-=(const Sample<T> &other)
     {
         download -= other.download;
-        upload -= other.upload;
+        upload   -= other.upload;
         return *this;
     }
 
-    T download {};
-    T upload {};
+    T download;
+    T upload;
 };
 
 typedef Sample<qlonglong> SpeedSample;

src/base/bittorrent/statistics.h

@@ -39,7 +39,7 @@ namespace BitTorrent
 class Statistics : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY_MOVE(Statistics)
+    Q_DISABLE_COPY(Statistics)
 
 public:
     explicit Statistics(BitTorrent::Session *session);

src/base/bittorrent/torrent.h

@@ -33,7 +33,6 @@
 #include <QString>
 #include <QtContainerFwd>
 
-#include "base/tagset.h"
 #include "abstractfilestorage.h"
 
 class QBitArray;
@@ -72,7 +71,6 @@ namespace BitTorrent
 
         ForcedDownloading,
         Downloading,
-        ForcedDownloadingMetadata,
         DownloadingMetadata,
         StalledDownloading,
 
@@ -180,7 +178,7 @@ namespace BitTorrent
         virtual bool belongsToCategory(const QString &category) const = 0;
         virtual bool setCategory(const QString &category) = 0;
 
-        virtual TagSet tags() const = 0;
+        virtual QSet<QString> tags() const = 0;
         virtual bool hasTag(const QString &tag) const = 0;
         virtual bool addTag(const QString &tag) = 0;
         virtual bool removeTag(const QString &tag) = 0;
@@ -193,7 +191,6 @@ namespace BitTorrent
         virtual qreal ratioLimit() const = 0;
         virtual int seedingTimeLimit() const = 0;
 
-        virtual QStringList filePaths() const = 0;
         virtual QStringList absoluteFilePaths() const = 0;
         virtual QVector<DownloadPriority> filePriorities() const = 0;
 
@@ -215,6 +212,7 @@ namespace BitTorrent
         virtual bool hasMetadata() const = 0;
         virtual bool hasMissingFiles() const = 0;
         virtual bool hasError() const = 0;
+        virtual bool hasFilteredPieces() const = 0;
         virtual int queuePosition() const = 0;
         virtual QVector<TrackerEntry> trackers() const = 0;
         virtual QVector<QUrl> urlSeeds() const = 0;

src/base/bittorrent/torrentcreatorthread.cpp

@@ -30,21 +30,23 @@
 
 #include <fstream>
 
+#include <libtorrent/bencode.hpp>
 #include <libtorrent/create_torrent.hpp>
 #include <libtorrent/file_storage.hpp>
 #include <libtorrent/torrent_info.hpp>
 
 #include <QDirIterator>
+#include <QFile>
 #include <QFileInfo>
 #include <QHash>
 
 #include "base/exceptions.h"
 #include "base/global.h"
-#include "base/utils/compare.h"
 #include "base/utils/fs.h"
 #include "base/utils/io.h"
+#include "base/utils/string.h"
 #include "base/version.h"
-#include "lttypecast.h"
+#include "ltunderlyingtype.h"
 
 namespace
 {
@@ -55,7 +57,7 @@ namespace
         return !Utils::Fs::fileName(QString::fromStdString(f)).startsWith('.');
     }
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     lt::create_flags_t toNativeTorrentFormatFlag(const BitTorrent::TorrentFormat torrentFormat)
     {
         switch (torrentFormat)
@@ -96,12 +98,6 @@ void TorrentCreatorThread::sendProgressSignal(int currentPieceIdx, int totalPiec
     emit updateProgress(static_cast<int>((currentPieceIdx * 100.) / totalPieces));
 }
 
-void TorrentCreatorThread::checkInterruptionRequested() const
-{
-    if (isInterruptionRequested())
-        throw RuntimeError(tr("Operation aborted"));
-}
-
 void TorrentCreatorThread::run()
 {
     emit updateProgress(0);
@@ -109,7 +105,6 @@ void TorrentCreatorThread::run()
     try
     {
         const QString parentPath = Utils::Fs::branchPath(m_params.inputPath) + '/';
-        const Utils::Compare::NaturalLessThan<Qt::CaseInsensitive> naturalLessThan {};
 
         // Adding files to the torrent
         lt::file_storage fs;
@@ -122,13 +117,13 @@ void TorrentCreatorThread::run()
             // need to sort the file names by natural sort order
             QStringList dirs = {m_params.inputPath};
 
-            QDirIterator dirIter {m_params.inputPath, (QDir::AllDirs | QDir::NoDotAndDotDot), QDirIterator::Subdirectories};
+            QDirIterator dirIter(m_params.inputPath, (QDir::AllDirs | QDir::NoDotAndDotDot), QDirIterator::Subdirectories);
             while (dirIter.hasNext())
             {
                 dirIter.next();
                 dirs += dirIter.filePath();
             }
-            std::sort(dirs.begin(), dirs.end(), naturalLessThan);
+            std::sort(dirs.begin(), dirs.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
 
             QStringList fileNames;
             QHash<QString, qint64> fileSizeMap;
@@ -147,7 +142,7 @@ void TorrentCreatorThread::run()
                     fileSizeMap[relFilePath] = fileIter.fileInfo().size();
                 }
 
-                std::sort(tmpNames.begin(), tmpNames.end(), naturalLessThan);
+                std::sort(tmpNames.begin(), tmpNames.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
                 fileNames += tmpNames;
             }
 
@@ -155,9 +150,9 @@ void TorrentCreatorThread::run()
                 fs.add_file(fileName.toStdString(), fileSizeMap[fileName]);
         }
 
-        checkInterruptionRequested();
+        if (isInterruptionRequested()) return;
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
         lt::create_torrent newTorrent {fs, m_params.pieceSize, toNativeTorrentFormatFlag(m_params.torrentFormat)};
 #else
         lt::create_torrent newTorrent(fs, m_params.pieceSize, m_params.paddedFileSizeLimit
@@ -185,8 +180,10 @@ void TorrentCreatorThread::run()
         lt::set_piece_hashes(newTorrent, Utils::Fs::toNativePath(parentPath).toStdString()
             , [this, &newTorrent](const lt::piece_index_t n)
         {
-            checkInterruptionRequested();
-            sendProgressSignal(LT::toUnderlyingType(n), newTorrent.num_pieces());
+            if (isInterruptionRequested())
+                throw RuntimeError {tr("Create new torrent aborted.")};
+
+            sendProgressSignal(static_cast<LTUnderlyingType<lt::piece_index_t>>(n), newTorrent.num_pieces());
         });
 
         // Set qBittorrent as creator and add user comment to
@@ -196,7 +193,7 @@ void TorrentCreatorThread::run()
         // Is private ?
         newTorrent.set_priv(m_params.isPrivate);
 
-        checkInterruptionRequested();
+        if (isInterruptionRequested()) return;
 
         lt::entry entry = newTorrent.generate();
 
@@ -204,12 +201,25 @@ void TorrentCreatorThread::run()
         if (!m_params.source.isEmpty())
             entry["info"]["source"] = m_params.source.toStdString();
 
-        checkInterruptionRequested();
+        if (isInterruptionRequested()) return;
 
         // create the torrent
-        const nonstd::expected<void, QString> result = Utils::IO::saveToFile(m_params.savePath, entry);
-        if (!result)
-            throw RuntimeError(result.error());
+        QFile outfile {m_params.savePath};
+        if (!outfile.open(QIODevice::WriteOnly))
+        {
+            throw RuntimeError {tr("Create new torrent file failed. Reason: %1")
+                .arg(outfile.errorString())};
+        }
+
+        if (isInterruptionRequested()) return;
+
+        lt::bencode(Utils::IO::FileDeviceOutputIterator {outfile}, entry);
+        if (outfile.error() != QFileDevice::NoError)
+        {
+            throw RuntimeError {tr("Create new torrent file failed. Reason: %1")
+                .arg(outfile.errorString())};
+        }
+        outfile.close();
 
         emit updateProgress(100);
         emit creationSuccess(m_params.savePath, parentPath);
@@ -224,7 +234,7 @@ void TorrentCreatorThread::run()
     }
 }
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
 int TorrentCreatorThread::calculateTotalPieces(const QString &inputPath, const int pieceSize, const TorrentFormat torrentFormat)
 #else
 int TorrentCreatorThread::calculateTotalPieces(const QString &inputPath, const int pieceSize, const bool isAlignmentOptimized, const int paddedFileSizeLimit)
@@ -236,7 +246,7 @@ int TorrentCreatorThread::calculateTotalPieces(const QString &inputPath, const i
     lt::file_storage fs;
     lt::add_files(fs, Utils::Fs::toNativePath(inputPath).toStdString(), fileFilter);
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     return lt::create_torrent {fs, pieceSize, toNativeTorrentFormatFlag(torrentFormat)}.num_pieces();
 #else
     return lt::create_torrent(fs, pieceSize, paddedFileSizeLimit

src/base/bittorrent/torrentcreatorthread.h

@@ -28,12 +28,14 @@
 
 #pragma once
 
+#include <libtorrent/version.hpp>
+
 #include <QStringList>
 #include <QThread>
 
 namespace BitTorrent
 {
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     enum class TorrentFormat
     {
         V1,
@@ -45,7 +47,7 @@ namespace BitTorrent
     struct TorrentCreatorParams
     {
         bool isPrivate;
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
         TorrentFormat torrentFormat;
 #else
         bool isAlignmentOptimized;
@@ -63,30 +65,30 @@ namespace BitTorrent
     class TorrentCreatorThread final : public QThread
     {
         Q_OBJECT
-        Q_DISABLE_COPY_MOVE(TorrentCreatorThread)
 
     public:
-        explicit TorrentCreatorThread(QObject *parent = nullptr);
-        ~TorrentCreatorThread() override;
+        TorrentCreatorThread(QObject *parent = nullptr);
+        ~TorrentCreatorThread();
 
         void create(const TorrentCreatorParams &params);
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
         static int calculateTotalPieces(const QString &inputPath, const int pieceSize, const TorrentFormat torrentFormat);
 #else
         static int calculateTotalPieces(const QString &inputPath
             , const int pieceSize, const bool isAlignmentOptimized, int paddedFileSizeLimit);
 #endif
 
+    protected:
+        void run() override;
+
     signals:
         void creationFailure(const QString &msg);
         void creationSuccess(const QString &path, const QString &branchPath);
         void updateProgress(int progress);
 
     private:
-        void run() override;
         void sendProgressSignal(int currentPieceIdx, int totalPieces);
-        void checkInterruptionRequested() const;
 
         TorrentCreatorParams m_params;
     };

src/base/bittorrent/torrentimpl.cpp

@@ -43,8 +43,9 @@
 #include <libtorrent/session.hpp>
 #include <libtorrent/storage_defs.hpp>
 #include <libtorrent/time.hpp>
+#include <libtorrent/version.hpp>
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
 #include <libtorrent/info_hash.hpp>
 #endif
 
@@ -62,9 +63,8 @@
 #include "base/utils/string.h"
 #include "common.h"
 #include "downloadpriority.h"
-#include "loadtorrentparams.h"
 #include "ltqhash.h"
-#include "lttypecast.h"
+#include "ltunderlyingtype.h"
 #include "peeraddress.h"
 #include "peerinfo.h"
 #include "session.h"
@@ -74,6 +74,20 @@ using namespace BitTorrent;
 
 namespace
 {
+    std::vector<lt::download_priority_t> toLTDownloadPriorities(const QVector<DownloadPriority> &priorities)
+    {
+        std::vector<lt::download_priority_t> out;
+        out.reserve(priorities.size());
+
+        std::transform(priorities.cbegin(), priorities.cend()
+                       , std::back_inserter(out), [](const DownloadPriority priority)
+        {
+            return static_cast<lt::download_priority_t>(
+                        static_cast<LTUnderlyingType<lt::download_priority_t>>(priority));
+        });
+        return out;
+    }
+
     lt::announce_entry makeNativeAnnouncerEntry(const QString &url, const int tier)
     {
         lt::announce_entry entry {url.toStdString()};
@@ -81,7 +95,7 @@ namespace
         return entry;
     }
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     TrackerEntry fromNativeAnnouncerEntry(const lt::announce_entry &nativeEntry
         , const lt::info_hash_t &hashes, const QMap<lt::tcp::endpoint, int> &trackerPeerCounts)
 #else
@@ -96,8 +110,8 @@ namespace
         int numNotWorking = 0;
         QString firstTrackerMessage;
         QString firstErrorMessage;
-#ifdef QBT_USES_LIBTORRENT2
-        const auto numEndpoints = static_cast<qsizetype>(nativeEntry.endpoints.size() * ((hashes.has_v1() && hashes.has_v2()) ? 2 : 1));
+#if (LIBTORRENT_VERSION_NUM >= 20000)
+        const size_t numEndpoints = nativeEntry.endpoints.size() * ((hashes.has_v1() && hashes.has_v2()) ? 2 : 1);
         trackerEntry.endpoints.reserve(static_cast<decltype(trackerEntry.endpoints)::size_type>(numEndpoints));
         for (const lt::announce_endpoint &endpoint : nativeEntry.endpoints)
         {
@@ -152,8 +166,8 @@ namespace
             }
         }
 #else
-        const auto numEndpoints = static_cast<qsizetype>(nativeEntry.endpoints.size());
-        trackerEntry.endpoints.reserve(static_cast<decltype(trackerEntry.endpoints)::size_type>(numEndpoints));
+        const int numEndpoints = nativeEntry.endpoints.size();
+        trackerEntry.endpoints.reserve(numEndpoints);
         for (const lt::announce_endpoint &endpoint : nativeEntry.endpoints)
         {
             TrackerEntry::EndpointStats trackerEndpoint;
@@ -250,7 +264,7 @@ TorrentImpl::TorrentImpl(Session *session, lt::session *nativeSession
     , m_session(session)
     , m_nativeSession(nativeSession)
     , m_nativeHandle(nativeHandle)
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     , m_infoHash(m_nativeHandle.info_hashes())
 #else
     , m_infoHash(m_nativeHandle.info_hash())
@@ -261,12 +275,12 @@ TorrentImpl::TorrentImpl(Session *session, lt::session *nativeSession
     , m_tags(params.tags)
     , m_ratioLimit(params.ratioLimit)
     , m_seedingTimeLimit(params.seedingTimeLimit)
-    , m_operatingMode(params.operatingMode)
+    , m_operatingMode(params.forced ? TorrentOperatingMode::Forced : TorrentOperatingMode::AutoManaged)
     , m_contentLayout(params.contentLayout)
     , m_hasSeedStatus(params.hasSeedStatus)
     , m_hasFirstLastPiecePriority(params.firstLastPiecePriority)
     , m_useAutoTMM(params.savePath.isEmpty())
-    , m_isStopped(params.stopped)
+    , m_isStopped(params.paused)
     , m_ltAddTorrentParams(params.ltAddTorrentParams)
 {
     if (m_useAutoTMM)
@@ -463,7 +477,7 @@ QVector<TrackerEntry> TorrentImpl::trackers() const
     for (const lt::announce_entry &tracker : nativeTrackers)
     {
         const QString trackerURL = QString::fromStdString(tracker.url);
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
         entries << fromNativeAnnouncerEntry(tracker, m_nativeHandle.info_hashes(), m_trackerPeerCounts[trackerURL]);
 #else
         entries << fromNativeAnnouncerEntry(tracker, m_trackerPeerCounts[trackerURL]);
@@ -688,7 +702,7 @@ bool TorrentImpl::belongsToCategory(const QString &category) const
     return false;
 }
 
-TagSet TorrentImpl::tags() const
+QSet<QString> TorrentImpl::tags() const
 {
     return m_tags;
 }
@@ -702,18 +716,18 @@ bool TorrentImpl::addTag(const QString &tag)
 {
     if (!Session::isValidTag(tag))
         return false;
-    if (hasTag(tag))
-        return false;
 
-    if (!m_session->hasTag(tag))
+    if (!hasTag(tag))
     {
-        if (!m_session->addTag(tag))
-            return false;
+        if (!m_session->hasTag(tag))
+            if (!m_session->addTag(tag))
+                return false;
+        m_tags.insert(tag);
+        m_session->handleTorrentNeedSaveResumeData(this);
+        m_session->handleTorrentTagAdded(this, tag);
+        return true;
     }
-    m_tags.insert(tag);
-    m_session->handleTorrentNeedSaveResumeData(this);
-    m_session->handleTorrentTagAdded(this, tag);
-    return true;
+    return false;
 }
 
 bool TorrentImpl::removeTag(const QString &tag)
@@ -748,19 +762,20 @@ int TorrentImpl::seedingTimeLimit() const
     return m_seedingTimeLimit;
 }
 
-QString TorrentImpl::filePath(const int index) const
+QString TorrentImpl::filePath(int index) const
 {
     return m_torrentInfo.filePath(index);
 }
 
-qlonglong TorrentImpl::fileSize(const int index) const
+QString TorrentImpl::fileName(int index) const
 {
-    return m_torrentInfo.fileSize(index);
+    if (!hasMetadata()) return {};
+    return Utils::Fs::fileName(filePath(index));
 }
 
-QStringList TorrentImpl::filePaths() const
+qlonglong TorrentImpl::fileSize(int index) const
 {
-    return m_torrentInfo.filePaths();
+    return m_torrentInfo.fileSize(index);
 }
 
 // Return a list of absolute paths corresponding
@@ -769,9 +784,8 @@ QStringList TorrentImpl::absoluteFilePaths() const
 {
     if (!hasMetadata()) return {};
 
-    const QDir saveDir {savePath(true)};
+    const QDir saveDir(savePath(true));
     QStringList res;
-    res.reserve(filesCount());
     for (int i = 0; i < filesCount(); ++i)
         res << Utils::Fs::expandPathAbs(saveDir.absoluteFilePath(filePath(i)));
     return res;
@@ -779,19 +793,13 @@ QStringList TorrentImpl::absoluteFilePaths() const
 
 QVector<DownloadPriority> TorrentImpl::filePriorities() const
 {
-    if (!hasMetadata())
-        return {};
-
     const std::vector<lt::download_priority_t> fp = m_nativeHandle.get_file_priorities();
 
     QVector<DownloadPriority> ret;
-    ret.reserve(filesCount());
-    for (const lt::file_index_t nativeIndex : asConst(m_torrentInfo.nativeIndexes()))
+    std::transform(fp.cbegin(), fp.cend(), std::back_inserter(ret), [](lt::download_priority_t priority)
     {
-        const auto priority = LT::fromNative(fp[LT::toUnderlyingType(nativeIndex)]);
-        ret.append(priority);
-    }
-
+        return static_cast<DownloadPriority>(static_cast<LTUnderlyingType<lt::download_priority_t>>(priority));
+    });
     return ret;
 }
 
@@ -823,7 +831,6 @@ bool TorrentImpl::isDownloading() const
 {
     return m_state == TorrentState::Downloading
             || m_state == TorrentState::DownloadingMetadata
-            || m_state == TorrentState::ForcedDownloadingMetadata
             || m_state == TorrentState::StalledDownloading
             || m_state == TorrentState::CheckingDownloading
             || m_state == TorrentState::PausedDownloading
@@ -856,7 +863,6 @@ bool TorrentImpl::isActive() const
         return (uploadPayloadRate() > 0);
 
     return m_state == TorrentState::DownloadingMetadata
-            || m_state == TorrentState::ForcedDownloadingMetadata
             || m_state == TorrentState::Downloading
             || m_state == TorrentState::ForcedDownloading
             || m_state == TorrentState::Uploading
@@ -926,7 +932,7 @@ void TorrentImpl::updateState()
         else if (m_session->isQueueingSystemEnabled() && isQueued())
             m_state = TorrentState::QueuedDownloading;
         else
-            m_state = isForced() ? TorrentState::ForcedDownloadingMetadata : TorrentState::DownloadingMetadata;
+            m_state = TorrentState::DownloadingMetadata;
     }
     else if ((m_nativeStatus.state == lt::torrent_status::checking_files)
              && (!isPaused() || (m_nativeStatus.flags & lt::torrent_flags::auto_managed)
@@ -978,6 +984,15 @@ bool TorrentImpl::hasError() const
     return (m_nativeStatus.errc || (m_nativeStatus.flags & lt::torrent_flags::upload_mode));
 }
 
+bool TorrentImpl::hasFilteredPieces() const
+{
+    const std::vector<lt::download_priority_t> pp = m_nativeHandle.get_piece_priorities();
+    return std::any_of(pp.cbegin(), pp.cend(), [](const lt::download_priority_t priority)
+    {
+        return (priority == lt::download_priority_t {0});
+    });
+}
+
 int TorrentImpl::queuePosition() const
 {
     return static_cast<int>(m_nativeStatus.queue_position);
@@ -1074,18 +1089,16 @@ QVector<qreal> TorrentImpl::filesProgress() const
     std::vector<int64_t> fp;
     m_nativeHandle.file_progress(fp, lt::torrent_handle::piece_granularity);
 
-    const int count = filesCount();
-    const auto nativeIndexes = m_torrentInfo.nativeIndexes();
+    const int count = static_cast<int>(fp.size());
     QVector<qreal> result;
     result.reserve(count);
     for (int i = 0; i < count; ++i)
     {
-        const int64_t progress = fp[LT::toUnderlyingType(nativeIndexes[i])];
         const qlonglong size = fileSize(i);
-        if ((size <= 0) || (progress == size))
+        if ((size <= 0) || (fp[i] == size))
             result << 1;
         else
-            result << (progress / static_cast<qreal>(size));
+            result << (fp[i] / static_cast<qreal>(size));
     }
 
     return result;
@@ -1236,7 +1249,7 @@ QBitArray TorrentImpl::downloadingPieces() const
     m_nativeHandle.get_download_queue(queue);
 
     for (const lt::partial_piece_info &info : queue)
-        result.setBit(LT::toUnderlyingType(info.piece_index));
+        result.setBit(static_cast<LTUnderlyingType<lt::piece_index_t>>(info.piece_index));
 
     return result;
 }
@@ -1246,7 +1259,7 @@ QVector<int> TorrentImpl::pieceAvailability() const
     std::vector<int> avail;
     m_nativeHandle.piece_availability(avail);
 
-    return {avail.cbegin(), avail.cend()};
+    return Vector::fromStdVector(avail);
 }
 
 qreal TorrentImpl::distributedCopies() const
@@ -1390,7 +1403,7 @@ void TorrentImpl::move_impl(QString path, const MoveStorageMode mode)
     }
 }
 
-void TorrentImpl::forceReannounce(const int index)
+void TorrentImpl::forceReannounce(int index)
 {
     m_nativeHandle.force_reannounce(0, index);
 }
@@ -1453,29 +1466,28 @@ void TorrentImpl::applyFirstLastPiecePriority(const bool enabled, const QVector<
 
     // Download first and last pieces first for every file in the torrent
 
-    const QVector<DownloadPriority> filePriorities =
-            !updatedFilePrio.isEmpty() ? updatedFilePrio : this->filePriorities();
+    const std::vector<lt::download_priority_t> filePriorities = !updatedFilePrio.isEmpty() ? toLTDownloadPriorities(updatedFilePrio)
+                                                                           : nativeHandle().get_file_priorities();
     std::vector<lt::download_priority_t> piecePriorities = nativeHandle().get_piece_priorities();
 
     // Updating file priorities is an async operation in libtorrent, when we just updated it and immediately query it
     // we might get the old/wrong values, so we rely on `updatedFilePrio` in this case.
-    for (int index = 0; index < filePriorities.size(); ++index)
+    for (int index = 0; index < static_cast<int>(filePriorities.size()); ++index)
     {
-        const DownloadPriority filePrio = filePriorities[index];
-        if (filePrio <= DownloadPriority::Ignored)
+        const lt::download_priority_t filePrio = filePriorities[index];
+        if (filePrio <= lt::download_priority_t {0})
             continue;
 
         // Determine the priority to set
-        const DownloadPriority newPrio = enabled ? DownloadPriority::Maximum : filePrio;
-        const auto piecePrio = static_cast<lt::download_priority_t>(static_cast<int>(newPrio));
+        const lt::download_priority_t newPrio = enabled ? lt::download_priority_t {7} : filePrio;
         const TorrentInfo::PieceRange extremities = info().filePieces(index);
 
         // worst case: AVI index = 1% of total file size (at the end of the file)
         const int nNumPieces = std::ceil(fileSize(index) * 0.01 / pieceLength());
         for (int i = 0; i < nNumPieces; ++i)
         {
-            piecePriorities[extremities.first() + i] = piecePrio;
-            piecePriorities[extremities.last() - i] = piecePrio;
+            piecePriorities[extremities.first() + i] = newPrio;
+            piecePriorities[extremities.last() - i] = newPrio;
         }
     }
 
@@ -1491,16 +1503,10 @@ void TorrentImpl::endReceivedMetadataHandling(const QString &savePath, const QSt
 {
     lt::add_torrent_params &p = m_ltAddTorrentParams;
 
-    const TorrentInfo torrentInfo {m_nativeHandle.torrent_file()};
-    const auto nativeIndexes = torrentInfo.nativeIndexes();
+    p.ti = std::const_pointer_cast<lt::torrent_info>(m_nativeHandle.torrent_file());
     for (int i = 0; i < fileNames.size(); ++i)
-        p.renamed_files[nativeIndexes[i]] = fileNames[i].toStdString();
+        p.renamed_files[lt::file_index_t {i}] = fileNames[i].toStdString();
     p.save_path = Utils::Fs::toNativePath(savePath).toStdString();
-    p.ti = torrentInfo.nativeInfo();
-
-    const int internalFilesCount = p.ti->files().num_files(); // including .pad files
-    // Use qBittorrent default priority rather than libtorrent's (4)
-    p.file_priorities = std::vector(internalFilesCount, LT::toNative(DownloadPriority::Normal));
 
     reload();
 
@@ -1511,7 +1517,6 @@ void TorrentImpl::endReceivedMetadataHandling(const QString &savePath, const QSt
 
     m_maintenanceJob = MaintenanceJob::None;
     updateStatus();
-    prepareResumeData(p);
 
     m_session->handleTorrentMetadataReceived(this);
 }
@@ -1615,12 +1620,10 @@ void TorrentImpl::moveStorage(const QString &newPath, const MoveStorageMode mode
 
 void TorrentImpl::renameFile(const int index, const QString &path)
 {
-#ifndef QBT_USES_LIBTORRENT2
     const QString oldPath = filePath(index);
-    m_oldPath[index].push_back(oldPath);
-#endif
+    m_oldPath[lt::file_index_t {index}].push_back(oldPath);
     ++m_renameCount;
-    m_nativeHandle.rename_file(m_torrentInfo.nativeIndexes()[index], Utils::Fs::toNativePath(path).toStdString());
+    m_nativeHandle.rename_file(lt::file_index_t {index}, Utils::Fs::toNativePath(path).toStdString());
 }
 
 void TorrentImpl::handleStateUpdate(const lt::torrent_status &nativeStatus)
@@ -1766,10 +1769,31 @@ void TorrentImpl::handleTorrentResumedAlert(const lt::torrent_resumed_alert *p)
 
 void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
 {
+    if (m_hasMissingFiles)
+    {
+        const auto havePieces = m_ltAddTorrentParams.have_pieces;
+        const auto unfinishedPieces = m_ltAddTorrentParams.unfinished_pieces;
+        const auto verifiedPieces = m_ltAddTorrentParams.verified_pieces;
+
+        // Update recent resume data but preserve existing progress
+        m_ltAddTorrentParams = p->params;
+        m_ltAddTorrentParams.have_pieces = havePieces;
+        m_ltAddTorrentParams.unfinished_pieces = unfinishedPieces;
+        m_ltAddTorrentParams.verified_pieces = verifiedPieces;
+    }
+    else
+    {
+        // Update recent resume data
+        m_ltAddTorrentParams = p->params;
+    }
+
+    m_ltAddTorrentParams.added_time = addedTime().toSecsSinceEpoch();
+
+    // We shouldn't save upload_mode flag to allow torrent operate normally on next run
+    m_ltAddTorrentParams.flags &= ~lt::torrent_flags::upload_mode;
+
     if (m_maintenanceJob == MaintenanceJob::HandleMetadata)
     {
-        m_ltAddTorrentParams = p->params;
-
         m_ltAddTorrentParams.have_pieces.clear();
         m_ltAddTorrentParams.verified_pieces.clear();
 
@@ -1778,34 +1802,6 @@ void TorrentImpl::handleSaveResumeDataAlert(const lt::save_resume_data_alert *p)
 
         m_session->findIncompleteFiles(metadata, m_savePath);
     }
-    else
-    {
-        prepareResumeData(p->params);
-    }
-}
-
-void TorrentImpl::prepareResumeData(const lt::add_torrent_params &params)
-{
-    if (m_hasMissingFiles)
-    {
-        const auto havePieces = m_ltAddTorrentParams.have_pieces;
-        const auto unfinishedPieces = m_ltAddTorrentParams.unfinished_pieces;
-        const auto verifiedPieces = m_ltAddTorrentParams.verified_pieces;
-
-        // Update recent resume data but preserve existing progress
-        m_ltAddTorrentParams = params;
-        m_ltAddTorrentParams.have_pieces = havePieces;
-        m_ltAddTorrentParams.unfinished_pieces = unfinishedPieces;
-        m_ltAddTorrentParams.verified_pieces = verifiedPieces;
-    }
-    else
-    {
-        // Update recent resume data
-        m_ltAddTorrentParams = params;
-    }
-
-    // We shouldn't save upload_mode flag to allow torrent operate normally on next run
-    m_ltAddTorrentParams.flags &= ~lt::torrent_flags::upload_mode;
 
     LoadTorrentParams resumeData;
     resumeData.name = m_name;
@@ -1817,8 +1813,8 @@ void TorrentImpl::prepareResumeData(const lt::add_torrent_params &params)
     resumeData.seedingTimeLimit = m_seedingTimeLimit;
     resumeData.firstLastPiecePriority = m_hasFirstLastPiecePriority;
     resumeData.hasSeedStatus = m_hasSeedStatus;
-    resumeData.stopped = m_isStopped;
-    resumeData.operatingMode = m_operatingMode;
+    resumeData.paused = m_isStopped;
+    resumeData.forced = (m_operatingMode == TorrentOperatingMode::Forced);
     resumeData.ltAddTorrentParams = m_ltAddTorrentParams;
 
     m_session->handleTorrentResumeDataReady(this, resumeData);
@@ -1849,24 +1845,18 @@ void TorrentImpl::handleFastResumeRejectedAlert(const lt::fastresume_rejected_al
 
 void TorrentImpl::handleFileRenamedAlert(const lt::file_renamed_alert *p)
 {
-    const int fileIndex = m_torrentInfo.nativeIndexes().indexOf(p->index);
-    Q_ASSERT(fileIndex >= 0);
-
     // Remove empty leftover folders
     // For example renaming "a/b/c" to "d/b/c", then folders "a/b" and "a" will
     // be removed if they are empty
-#ifndef QBT_USES_LIBTORRENT2
-    const QString oldFilePath = m_oldPath[fileIndex].takeFirst();
-    if (m_oldPath[fileIndex].isEmpty())
-        m_oldPath.remove(fileIndex);
-#else
-    const QString oldFilePath = Utils::Fs::toUniformPath(p->old_name());
-#endif
+    const QString oldFilePath = m_oldPath[p->index].takeFirst();
     const QString newFilePath = Utils::Fs::toUniformPath(p->new_name());
 
-    QList<QStringView> oldPathParts = QStringView(oldFilePath).split('/', Qt::SkipEmptyParts);
+    if (m_oldPath[p->index].isEmpty())
+        m_oldPath.remove(p->index);
+
+    QVector<QStringRef> oldPathParts = oldFilePath.splitRef('/', QString::SkipEmptyParts);
     oldPathParts.removeLast();  // drop file name part
-    QList<QStringView> newPathParts = QStringView(newFilePath).split('/', Qt::SkipEmptyParts);
+    QVector<QStringRef> newPathParts = newFilePath.splitRef('/', QString::SkipEmptyParts);
     newPathParts.removeLast();  // drop file name part
 
 #if defined(Q_OS_WIN)
@@ -1885,7 +1875,7 @@ void TorrentImpl::handleFileRenamedAlert(const lt::file_renamed_alert *p)
 
     for (int i = (oldPathParts.size() - 1); i >= pathIdx; --i)
     {
-        QDir().rmdir(savePath() + Utils::String::join(oldPathParts, QString::fromLatin1("/")));
+        QDir().rmdir(savePath() + Utils::String::join(oldPathParts, QLatin1String("/")));
         oldPathParts.removeLast();
     }
 
@@ -1898,17 +1888,13 @@ void TorrentImpl::handleFileRenamedAlert(const lt::file_renamed_alert *p)
 
 void TorrentImpl::handleFileRenameFailedAlert(const lt::file_rename_failed_alert *p)
 {
-    const int fileIndex = m_torrentInfo.nativeIndexes().indexOf(p->index);
-    Q_ASSERT(fileIndex >= 0);
-
     LogMsg(tr("File rename failed. Torrent: \"%1\", file: \"%2\", reason: \"%3\"")
-        .arg(name(), filePath(fileIndex), QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING);
+        .arg(name(), filePath(static_cast<LTUnderlyingType<lt::file_index_t>>(p->index))
+             , QString::fromLocal8Bit(p->error.message().c_str())), Log::WARNING);
 
-#ifndef QBT_USES_LIBTORRENT2
-    m_oldPath[fileIndex].removeFirst();
-    if (m_oldPath[fileIndex].isEmpty())
-        m_oldPath.remove(fileIndex);
-#endif
+    m_oldPath[p->index].removeFirst();
+    if (m_oldPath[p->index].isEmpty())
+        m_oldPath.remove(p->index);
 
     --m_renameCount;
     while (!isMoveInProgress() && (m_renameCount == 0) && !m_moveFinishedTriggers.isEmpty())
@@ -1919,19 +1905,16 @@ void TorrentImpl::handleFileRenameFailedAlert(const lt::file_rename_failed_alert
 
 void TorrentImpl::handleFileCompletedAlert(const lt::file_completed_alert *p)
 {
-    const int fileIndex = m_torrentInfo.nativeIndexes().indexOf(p->index);
-    Q_ASSERT(fileIndex >= 0);
-
     qDebug("A file completed download in torrent \"%s\"", qUtf8Printable(name()));
     if (m_session->isAppendExtensionEnabled())
     {
-        QString name = filePath(fileIndex);
+        QString name = filePath(static_cast<LTUnderlyingType<lt::file_index_t>>(p->index));
         if (name.endsWith(QB_EXT))
         {
             const QString oldName = name;
             name.chop(QB_EXT.size());
             qDebug("Renaming %s to %s", qUtf8Printable(oldName), qUtf8Printable(name));
-            renameFile(fileIndex, name);
+            renameFile(static_cast<LTUnderlyingType<lt::file_index_t>>(p->index), name);
         }
     }
 }
@@ -1941,14 +1924,6 @@ void TorrentImpl::handleFileErrorAlert(const lt::file_error_alert *p)
     m_lastFileError = {p->error, p->op};
 }
 
-#ifdef QBT_USES_LIBTORRENT2
-void TorrentImpl::handleFilePrioAlert(const lt::file_prio_alert *)
-{
-    if (m_nativeHandle.need_save_resume_data())
-        m_session->handleTorrentNeedSaveResumeData(this);
-}
-#endif
-
 void TorrentImpl::handleMetadataReceivedAlert(const lt::metadata_received_alert *p)
 {
     Q_UNUSED(p);
@@ -1986,11 +1961,6 @@ void TorrentImpl::handleAlert(const lt::alert *a)
 {
     switch (a->type())
     {
-#ifdef QBT_USES_LIBTORRENT2
-    case lt::file_prio_alert::alert_type:
-        handleFilePrioAlert(static_cast<const lt::file_prio_alert*>(a));
-        break;
-#endif
     case lt::file_renamed_alert::alert_type:
         handleFileRenamedAlert(static_cast<const lt::file_renamed_alert*>(a));
         break;
@@ -2264,8 +2234,7 @@ QString TorrentImpl::createMagnetURI() const
 void TorrentImpl::prioritizeFiles(const QVector<DownloadPriority> &priorities)
 {
     if (!hasMetadata()) return;
-
-    Q_ASSERT(priorities.size() == filesCount());
+    if (priorities.size() != filesCount()) return;
 
     // Reset 'm_hasSeedStatus' if needed in order to react again to
     // 'torrent_finished_alert' and eg show tray notifications
@@ -2282,14 +2251,8 @@ void TorrentImpl::prioritizeFiles(const QVector<DownloadPriority> &priorities)
         }
     }
 
-    const int internalFilesCount = m_torrentInfo.nativeInfo()->files().num_files(); // including .pad files
-    auto nativePriorities = std::vector<lt::download_priority_t>(internalFilesCount, LT::toNative(DownloadPriority::Normal));
-    const auto nativeIndexes = m_torrentInfo.nativeIndexes();
-    for (int i = 0; i < priorities.size(); ++i)
-        nativePriorities[LT::toUnderlyingType(nativeIndexes[i])] = LT::toNative(priorities[i]);
-
     qDebug() << Q_FUNC_INFO << "Changing files priorities...";
-    m_nativeHandle.prioritize_files(nativePriorities);
+    m_nativeHandle.prioritize_files(toLTDownloadPriorities(priorities));
 
     // Restore first/last piece first option if necessary
     if (m_hasFirstLastPiecePriority)

src/base/bittorrent/torrentimpl.h

@@ -42,10 +42,10 @@
 #include <QMap>
 #include <QObject>
 #include <QQueue>
+#include <QSet>
 #include <QString>
 #include <QVector>
 
-#include "base/tagset.h"
 #include "infohash.h"
 #include "speedmonitor.h"
 #include "torrent.h"
@@ -54,7 +54,27 @@
 namespace BitTorrent
 {
     class Session;
-    struct LoadTorrentParams;
+    struct AddTorrentParams;
+
+    struct LoadTorrentParams
+    {
+        lt::add_torrent_params ltAddTorrentParams {};
+
+        QString name;
+        QString category;
+        QSet<QString> tags;
+        QString savePath;
+        TorrentContentLayout contentLayout = TorrentContentLayout::Original;
+        bool firstLastPiecePriority = false;
+        bool hasSeedStatus = false;
+        bool forced = false;
+        bool paused = false;
+
+        qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
+        int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
+
+        bool restored = false;  // is existing torrent job?
+    };
 
     enum class MoveStorageMode
     {
@@ -76,7 +96,7 @@ namespace BitTorrent
 
     class TorrentImpl final : public QObject, public Torrent
     {
-        Q_DISABLE_COPY_MOVE(TorrentImpl)
+        Q_DISABLE_COPY(TorrentImpl)
         Q_DECLARE_TR_FUNCTIONS(BitTorrent::TorrentImpl)
 
     public:
@@ -111,7 +131,7 @@ namespace BitTorrent
         bool belongsToCategory(const QString &category) const override;
         bool setCategory(const QString &category) override;
 
-        TagSet tags() const override;
+        QSet<QString> tags() const override;
         bool hasTag(const QString &tag) const override;
         bool addTag(const QString &tag) override;
         bool removeTag(const QString &tag) override;
@@ -126,8 +146,8 @@ namespace BitTorrent
         int seedingTimeLimit() const override;
 
         QString filePath(int index) const override;
+        QString fileName(int index) const override;
         qlonglong fileSize(int index) const override;
-        QStringList filePaths() const override;
         QStringList absoluteFilePaths() const override;
         QVector<DownloadPriority> filePriorities() const override;
 
@@ -149,6 +169,7 @@ namespace BitTorrent
         bool hasMetadata() const override;
         bool hasMissingFiles() const override;
         bool hasError() const override;
+        bool hasFilteredPieces() const override;
         int queuePosition() const override;
         QVector<TrackerEntry> trackers() const override;
         QVector<QUrl> urlSeeds() const override;
@@ -242,7 +263,7 @@ namespace BitTorrent
         QString actualStorageLocation() const;
 
     private:
-        using EventTrigger = std::function<void ()>;
+        typedef std::function<void ()> EventTrigger;
 
         void updateStatus();
         void updateStatus(const lt::torrent_status &nativeStatus);
@@ -251,9 +272,6 @@ namespace BitTorrent
         void handleFastResumeRejectedAlert(const lt::fastresume_rejected_alert *p);
         void handleFileCompletedAlert(const lt::file_completed_alert *p);
         void handleFileErrorAlert(const lt::file_error_alert *p);
-#ifdef QBT_USES_LIBTORRENT2
-        void handleFilePrioAlert(const lt::file_prio_alert *p);
-#endif
         void handleFileRenamedAlert(const lt::file_renamed_alert *p);
         void handleFileRenameFailedAlert(const lt::file_rename_failed_alert *p);
         void handleMetadataReceivedAlert(const lt::metadata_received_alert *p);
@@ -279,7 +297,6 @@ namespace BitTorrent
         void manageIncompleteFiles();
         void applyFirstLastPiecePriority(bool enabled, const QVector<DownloadPriority> &updatedFilePrio = {});
 
-        void prepareResumeData(const lt::add_torrent_params &params);
         void endReceivedMetadataHandling(const QString &savePath, const QStringList &fileNames);
         void reload();
 
@@ -301,20 +318,18 @@ namespace BitTorrent
 
         MaintenanceJob m_maintenanceJob = MaintenanceJob::None;
 
-#ifndef QBT_USES_LIBTORRENT2
-        // Until libtorrent provided an "old_name" field in `file_renamed_alert`
-        // we relied on this workaround to remove empty leftover folders
-        QHash<int, QVector<QString>> m_oldPath;
-#endif
+        // Until libtorrent provide an "old_name" field in `file_renamed_alert`
+        // we will rely on this workaround to remove empty leftover folders
+        QHash<lt::file_index_t, QVector<QString>> m_oldPath;
 
-        QHash<QString, QMap<lt::tcp::endpoint, int>> m_trackerPeerCounts;
         FileErrorInfo m_lastFileError;
+        QHash<QString, QMap<lt::tcp::endpoint, int>> m_trackerPeerCounts;
 
         // Persistent data
         QString m_name;
         QString m_savePath;
         QString m_category;
-        TagSet m_tags;
+        QSet<QString> m_tags;
         qreal m_ratioLimit;
         int m_seedingTimeLimit;
         TorrentOperatingMode m_operatingMode;

src/base/bittorrent/torrentinfo.cpp

@@ -28,8 +28,10 @@
 
 #include "torrentinfo.h"
 
+#include <libtorrent/bencode.hpp>
 #include <libtorrent/create_torrent.hpp>
 #include <libtorrent/error_code.hpp>
+#include <libtorrent/version.hpp>
 
 #include <QByteArray>
 #include <QDateTime>
@@ -40,6 +42,7 @@
 #include <QUrl>
 #include <QVector>
 
+#include "base/exceptions.h"
 #include "base/global.h"
 #include "base/utils/fs.h"
 #include "base/utils/io.h"
@@ -58,7 +61,7 @@ namespace
         {
             if (QDir::isAbsolutePath(filePath)) continue;
 
-            const auto filePathElements = QStringView(filePath).split(u'/');
+            const auto filePathElements = filePath.splitRef('/');
             // if at least one file has no root folder, no common root folder exists
             if (filePathElements.count() <= 1) return {};
 
@@ -75,23 +78,12 @@ namespace
 const int torrentInfoId = qRegisterMetaType<TorrentInfo>();
 
 TorrentInfo::TorrentInfo(std::shared_ptr<const lt::torrent_info> nativeInfo)
-    : m_nativeInfo {std::const_pointer_cast<lt::torrent_info>(nativeInfo)}
 {
-    if (!m_nativeInfo)
-        return;
-
-    const lt::file_storage &fileStorage = m_nativeInfo->files();
-    m_nativeIndexes.reserve(fileStorage.num_files());
-    for (const lt::file_index_t nativeIndex : fileStorage.file_range())
-    {
-        if (!fileStorage.pad_file_at(nativeIndex))
-            m_nativeIndexes.append(nativeIndex);
-    }
+    m_nativeInfo = std::const_pointer_cast<lt::torrent_info>(nativeInfo);
 }
 
 TorrentInfo::TorrentInfo(const TorrentInfo &other)
-    : m_nativeInfo {other.m_nativeInfo}
-    , m_nativeIndexes {other.m_nativeIndexes}
+    : m_nativeInfo(other.m_nativeInfo)
 {
 }
 
@@ -100,12 +92,11 @@ TorrentInfo &TorrentInfo::operator=(const TorrentInfo &other)
     if (this != &other)
     {
         m_nativeInfo = other.m_nativeInfo;
-        m_nativeIndexes = other.m_nativeIndexes;
     }
     return *this;
 }
 
-nonstd::expected<TorrentInfo, QString> TorrentInfo::load(const QByteArray &data) noexcept
+TorrentInfo TorrentInfo::load(const QByteArray &data, QString *error) noexcept
 {
     // 2-step construction to overcome default limits of `depth_limit` & `token_limit` which are
     // used in `torrent_info()` constructor
@@ -116,23 +107,42 @@ nonstd::expected<TorrentInfo, QString> TorrentInfo::load(const QByteArray &data)
     const lt::bdecode_node node = lt::bdecode(data, ec
         , nullptr, depthLimit, tokenLimit);
     if (ec)
-        return nonstd::make_unexpected(QString::fromStdString(ec.message()));
+    {
+        if (error)
+            *error = QString::fromStdString(ec.message());
+        return TorrentInfo();
+    }
 
     TorrentInfo info {std::shared_ptr<lt::torrent_info>(new lt::torrent_info(node, ec))};
     if (ec)
-        return nonstd::make_unexpected(QString::fromStdString(ec.message()));
+    {
+        if (error)
+            *error = QString::fromStdString(ec.message());
+        return TorrentInfo();
+    }
 
     return info;
 }
 
-nonstd::expected<TorrentInfo, QString> TorrentInfo::loadFromFile(const QString &path) noexcept
+TorrentInfo TorrentInfo::loadFromFile(const QString &path, QString *error) noexcept
 {
+    if (error)
+        error->clear();
+
     QFile file {path};
     if (!file.open(QIODevice::ReadOnly))
-        return nonstd::make_unexpected(file.errorString());
+    {
+        if (error)
+            *error = file.errorString();
+        return TorrentInfo();
+    }
 
     if (file.size() > MAX_TORRENT_SIZE)
-        return nonstd::make_unexpected(tr("File size exceeds max limit %1").arg(Utils::Misc::friendlyUnit(MAX_TORRENT_SIZE)));
+    {
+        if (error)
+            *error = tr("File size exceeds max limit %1").arg(Utils::Misc::friendlyUnit(MAX_TORRENT_SIZE));
+        return TorrentInfo();
+    }
 
     QByteArray data;
     try
@@ -141,36 +151,37 @@ nonstd::expected<TorrentInfo, QString> TorrentInfo::loadFromFile(const QString &
     }
     catch (const std::bad_alloc &e)
     {
-        return nonstd::make_unexpected(tr("Torrent file read error: %1").arg(e.what()));
+        if (error)
+            *error = tr("Torrent file read error: %1").arg(e.what());
+        return TorrentInfo();
     }
-
     if (data.size() != file.size())
-        return nonstd::make_unexpected(tr("Torrent file read error: size mismatch"));
+    {
+        if (error)
+            *error = tr("Torrent file read error: size mismatch");
+        return TorrentInfo();
+    }
 
     file.close();
 
-    return load(data);
+    return load(data, error);
 }
 
-nonstd::expected<void, QString> TorrentInfo::saveToFile(const QString &path) const
+void TorrentInfo::saveToFile(const QString &path) const
 {
     if (!isValid())
-        return nonstd::make_unexpected(tr("Invalid metadata"));
+        throw RuntimeError {tr("Invalid metadata.")};
 
-    try
-    {
-        const auto torrentCreator = lt::create_torrent(*nativeInfo());
-        const lt::entry torrentEntry = torrentCreator.generate();
-        const nonstd::expected<void, QString> result = Utils::IO::saveToFile(path, torrentEntry);
-        if (!result)
-            return result.get_unexpected();
-    }
-    catch (const lt::system_error &err)
-    {
-        return nonstd::make_unexpected(QString::fromLocal8Bit(err.what()));
-    }
+    const lt::create_torrent torrentCreator = lt::create_torrent(*(nativeInfo()));
+    const lt::entry torrentEntry = torrentCreator.generate();
 
-    return {};
+    QFile torrentFile {path};
+    if (!torrentFile.open(QIODevice::WriteOnly))
+        throw RuntimeError {torrentFile.errorString()};
+
+    lt::bencode(Utils::IO::FileDeviceOutputIterator {torrentFile}, torrentEntry);
+    if (torrentFile.error() != QFileDevice::NoError)
+        throw RuntimeError {torrentFile.errorString()};
 }
 
 bool TorrentInfo::isValid() const
@@ -182,7 +193,7 @@ InfoHash TorrentInfo::infoHash() const
 {
     if (!isValid()) return {};
 
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     return m_nativeInfo->info_hashes();
 #else
     return m_nativeInfo->info_hash();
@@ -230,7 +241,7 @@ qlonglong TorrentInfo::totalSize() const
 int TorrentInfo::filesCount() const
 {
     if (!isValid()) return -1;
-    return m_nativeIndexes.size();
+    return m_nativeInfo->num_files();
 }
 
 int TorrentInfo::pieceLength() const
@@ -255,36 +266,40 @@ QString TorrentInfo::filePath(const int index) const
 {
     if (!isValid()) return {};
     return Utils::Fs::toUniformPath(
-                QString::fromStdString(m_nativeInfo->files().file_path(m_nativeIndexes[index])));
+                QString::fromStdString(m_nativeInfo->files().file_path(lt::file_index_t {index})));
 }
 
 QStringList TorrentInfo::filePaths() const
 {
     QStringList list;
-    list.reserve(filesCount());
     for (int i = 0; i < filesCount(); ++i)
         list << filePath(i);
 
     return list;
 }
 
+QString TorrentInfo::fileName(const int index) const
+{
+    return Utils::Fs::fileName(filePath(index));
+}
+
 QString TorrentInfo::origFilePath(const int index) const
 {
     if (!isValid()) return {};
     return Utils::Fs::toUniformPath(
-                QString::fromStdString(m_nativeInfo->orig_files().file_path(m_nativeIndexes[index])));
+                QString::fromStdString(m_nativeInfo->orig_files().file_path(lt::file_index_t {index})));
 }
 
 qlonglong TorrentInfo::fileSize(const int index) const
 {
     if (!isValid()) return -1;
-    return m_nativeInfo->files().file_size(m_nativeIndexes[index]);
+    return m_nativeInfo->files().file_size(lt::file_index_t {index});
 }
 
 qlonglong TorrentInfo::fileOffset(const int index) const
 {
     if (!isValid()) return -1;
-    return m_nativeInfo->files().file_offset(m_nativeIndexes[index]);
+    return m_nativeInfo->files().file_offset(lt::file_index_t {index});
 }
 
 QVector<TrackerEntry> TorrentInfo::trackers() const
@@ -323,7 +338,7 @@ QVector<QUrl> TorrentInfo::urlSeeds() const
 QByteArray TorrentInfo::metadata() const
 {
     if (!isValid()) return {};
-#ifdef QBT_USES_LIBTORRENT2
+#if (LIBTORRENT_VERSION_NUM >= 20000)
     const lt::span<const char> infoSection {m_nativeInfo->info_section()};
     return {infoSection.data(), static_cast<int>(infoSection.size())};
 #else
@@ -353,12 +368,8 @@ QVector<int> TorrentInfo::fileIndicesForPiece(const int pieceIndex) const
                 lt::piece_index_t {pieceIndex}, 0, nativeInfo()->piece_size(lt::piece_index_t {pieceIndex}));
     QVector<int> res;
     res.reserve(static_cast<decltype(res)::size_type>(files.size()));
-    for (const lt::file_slice &fileSlice : files)
-    {
-        const int index = m_nativeIndexes.indexOf(fileSlice.file_index);
-        if (index >= 0)
-            res.append(index);
-    }
+    std::transform(files.begin(), files.end(), std::back_inserter(res),
+        [](const lt::file_slice &s) { return static_cast<int>(s.file_index); });
 
     return res;
 }
@@ -404,8 +415,8 @@ TorrentInfo::PieceRange TorrentInfo::filePieces(const int fileIndex) const
     }
 
     const lt::file_storage &files = nativeInfo()->files();
-    const auto fileSize = files.file_size(m_nativeIndexes[fileIndex]);
-    const auto fileOffset = files.file_offset(m_nativeIndexes[fileIndex]);
+    const auto fileSize = files.file_size(lt::file_index_t {fileIndex});
+    const auto fileOffset = files.file_offset(lt::file_index_t {fileIndex});
 
     const int beginIdx = (fileOffset / pieceLength());
     const int endIdx = ((fileOffset + fileSize - 1) / pieceLength());
@@ -418,7 +429,7 @@ TorrentInfo::PieceRange TorrentInfo::filePieces(const int fileIndex) const
 void TorrentInfo::renameFile(const int index, const QString &newPath)
 {
     if (!isValid()) return;
-    nativeInfo()->rename_file(m_nativeIndexes[index], Utils::Fs::toNativePath(newPath).toStdString());
+    nativeInfo()->rename_file(lt::file_index_t {index}, Utils::Fs::toNativePath(newPath).toStdString());
 }
 
 int TorrentInfo::fileIndex(const QString &fileName) const
@@ -470,8 +481,8 @@ void TorrentInfo::stripRootFolder()
     if (files.name() != newName)
     {
         files.set_name(newName);
-        for (const lt::file_index_t nativeIndex : files.file_range())
-            files.rename_file(nativeIndex, files.file_path(nativeIndex));
+        for (int i = 0; i < files.num_files(); ++i)
+            files.rename_file(lt::file_index_t {i}, files.file_path(lt::file_index_t {i}));
     }
 
     files.set_name("");
@@ -490,8 +501,8 @@ void TorrentInfo::addRootFolder()
     const std::string rootPrefix = Utils::Fs::toNativePath(rootFolder + QLatin1Char {'/'}).toStdString();
     lt::file_storage files = m_nativeInfo->files();
     files.set_name(rootFolder.toStdString());
-    for (const lt::file_index_t nativeIndex : files.file_range())
-        files.rename_file(nativeIndex, rootPrefix + files.file_path(nativeIndex));
+    for (int i = 0; i < files.num_files(); ++i)
+        files.rename_file(lt::file_index_t {i}, rootPrefix + files.file_path(lt::file_index_t {i}));
     m_nativeInfo->remap_files(files);
 }
 
@@ -512,8 +523,3 @@ std::shared_ptr<lt::torrent_info> TorrentInfo::nativeInfo() const
 {
     return m_nativeInfo;
 }
-
-QVector<lt::file_index_t> TorrentInfo::nativeIndexes() const
-{
-    return m_nativeIndexes;
-}

src/base/bittorrent/torrentinfo.h

@@ -33,7 +33,6 @@
 #include <QCoreApplication>
 #include <QtContainerFwd>
 
-#include "base/3rdparty/expected.hpp"
 #include "base/indexrange.h"
 #include "abstractfilestorage.h"
 #include "torrentcontentlayout.h"
@@ -56,9 +55,9 @@ namespace BitTorrent
         explicit TorrentInfo(std::shared_ptr<const lt::torrent_info> nativeInfo = {});
         TorrentInfo(const TorrentInfo &other);
 
-        static nonstd::expected<TorrentInfo, QString> load(const QByteArray &data) noexcept;
-        static nonstd::expected<TorrentInfo, QString> loadFromFile(const QString &path) noexcept;
-        nonstd::expected<void, QString> saveToFile(const QString &path) const;
+        static TorrentInfo load(const QByteArray &data, QString *error = nullptr) noexcept;
+        static TorrentInfo loadFromFile(const QString &path, QString *error = nullptr) noexcept;
+        void saveToFile(const QString &path) const;
 
         TorrentInfo &operator=(const TorrentInfo &other);
 
@@ -76,6 +75,7 @@ namespace BitTorrent
         int piecesCount() const;
         QString filePath(int index) const override;
         QStringList filePaths() const;
+        QString fileName(int index) const override;
         QString origFilePath(int index) const;
         qlonglong fileSize(int index) const override;
         qlonglong fileOffset(int index) const;
@@ -99,7 +99,6 @@ namespace BitTorrent
         void setContentLayout(TorrentContentLayout layout);
 
         std::shared_ptr<lt::torrent_info> nativeInfo() const;
-        QVector<lt::file_index_t> nativeIndexes() const;
 
     private:
         // returns file index or -1 if fileName is not found
@@ -109,10 +108,6 @@ namespace BitTorrent
         TorrentContentLayout defaultContentLayout() const;
 
         std::shared_ptr<lt::torrent_info> m_nativeInfo;
-
-        // internal indexes of files (payload only, excluding any .pad files)
-        // by which they are addressed in libtorrent
-        QVector<lt::file_index_t> m_nativeIndexes;
     };
 }
 

src/base/bittorrent/tracker.h

@@ -72,7 +72,7 @@ namespace BitTorrent
     class Tracker final : public QObject, public Http::IRequestHandler, private Http::ResponseBuilder
     {
         Q_OBJECT
-        Q_DISABLE_COPY_MOVE(Tracker)
+        Q_DISABLE_COPY(Tracker)
 
         struct TrackerAnnounceRequest;
 

src/base/bittorrent/trackerentry.h

@@ -53,10 +53,10 @@ namespace BitTorrent
             int numSeeds = -1;
             int numLeeches = -1;
             int numDownloaded = -1;
-            QString message {};
+            QString message;
         };
 
-        QString url {};
+        QString url;
         int tier = 0;
 
         QVector<EndpointStats> endpoints {};
@@ -67,7 +67,7 @@ namespace BitTorrent
         int numSeeds = -1;
         int numLeeches = -1;
         int numDownloaded = -1;
-        QString message {};
+        QString message;
     };
 
     bool operator==(const TrackerEntry &left, const TrackerEntry &right);

src/base/global.h

@@ -35,16 +35,44 @@
 #define QBT_APP_64BIT
 #endif
 
-inline const char C_TORRENT_FILE_EXTENSION[] = ".torrent";
-inline const int MAX_TORRENT_SIZE = 100 * 1024 * 1024; // 100 MiB
+const char C_TORRENT_FILE_EXTENSION[] = ".torrent";
+const int MAX_TORRENT_SIZE = 100 * 1024 * 1024; // 100 MiB
 
 template <typename T>
-constexpr typename std::add_const_t<T> &asConst(T &t) noexcept { return t; }
+constexpr typename std::add_const<T>::type &asConst(T &t) noexcept { return t; }
 
 // Forward rvalue as const
 template <typename T>
-constexpr typename std::add_const_t<T> asConst(T &&t) noexcept { return std::move(t); }
+constexpr typename std::add_const<T>::type asConst(T &&t) noexcept { return std::move(t); }
 
 // Prevent const rvalue arguments
 template <typename T>
 void asConst(const T &&) = delete;
+
+namespace List
+{
+    // Replacement for the deprecated`QSet<T> QSet::fromList(const QList<T> &list)`
+    template <typename T>
+    QSet<T> toSet(const QList<T> &list)
+    {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        return {list.cbegin(), list.cend()};
+#else
+        return QSet<T>::fromList(list);
+#endif
+    }
+}
+
+namespace Vector
+{
+    // Replacement for the deprecated `QVector<T> QVector::fromStdVector(const std::vector<T> &vector)`
+    template <typename T>
+    QVector<T> fromStdVector(const std::vector<T> &vector)
+    {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+        return {vector.cbegin(), vector.cend()};
+#else
+        return QVector<T>::fromStdVector(vector);
+#endif
+    }
+}

src/base/http/connection.cpp

@@ -137,9 +137,9 @@ bool Connection::acceptsGzipEncoding(QString codings)
 {
     // [rfc7231] 5.3.4. Accept-Encoding
 
-    const auto isCodingAvailable = [](const QList<QStringView> &list, const QStringView encoding) -> bool
+    const auto isCodingAvailable = [](const QVector<QStringRef> &list, const QString &encoding) -> bool
     {
-        for (const QStringView &str : list)
+        for (const QStringRef &str : list)
         {
             if (!str.startsWith(encoding))
                 continue;
@@ -149,7 +149,7 @@ bool Connection::acceptsGzipEncoding(QString codings)
                 return true;
 
             // [rfc7231] 5.3.1. Quality Values
-            const QStringView substr = str.mid(encoding.size() + 3);  // ex. skip over "gzip;q="
+            const QStringRef substr = str.mid(encoding.size() + 3);  // ex. skip over "gzip;q="
 
             bool ok = false;
             const double qvalue = substr.toDouble(&ok);
@@ -161,15 +161,15 @@ bool Connection::acceptsGzipEncoding(QString codings)
         return false;
     };
 
-    const QList<QStringView> list = QStringView(codings.remove(' ').remove('\t')).split(u',', Qt::SkipEmptyParts);
+    const QVector<QStringRef> list = codings.remove(' ').remove('\t').splitRef(',', QString::SkipEmptyParts);
     if (list.isEmpty())
         return false;
 
-    const bool canGzip = isCodingAvailable(list, QString::fromLatin1("gzip"));
+    const bool canGzip = isCodingAvailable(list, QLatin1String("gzip"));
     if (canGzip)
         return true;
 
-    const bool canAny = isCodingAvailable(list, QString::fromLatin1("*"));
+    const bool canAny = isCodingAvailable(list, QLatin1String("*"));
     if (canAny)
         return true;
 

src/base/http/connection.h

@@ -43,7 +43,7 @@ namespace Http
     class Connection : public QObject
     {
         Q_OBJECT
-        Q_DISABLE_COPY_MOVE(Connection)
+        Q_DISABLE_COPY(Connection)
 
     public:
         Connection(QTcpSocket *socket, IRequestHandler *requestHandler, QObject *parent = nullptr);

src/base/http/requestparser.cpp

@@ -57,7 +57,7 @@ namespace
         return in;
     }
 
-    bool parseHeaderLine(const QStringView line, HeaderMap &out)
+    bool parseHeaderLine(const QString &line, HeaderMap &out)
     {
         // [rfc7230] 3.2. Header Fields
         const int i = line.indexOf(':');
@@ -67,8 +67,8 @@ namespace
             return false;
         }
 
-        const QString name = line.left(i).trimmed().toString().toLower();
-        const QString value = line.mid(i + 1).trimmed().toString();
+        const QString name = line.leftRef(i).trimmed().toString().toLower();
+        const QString value = line.midRef(i + 1).trimmed().toString();
         out[name] = value;
 
         return true;
@@ -145,10 +145,10 @@ RequestParser::ParseResult RequestParser::doParse(const QByteArray &data)
     return {ParseStatus::BadRequest, Request(), 0};  // TODO: SHOULD respond "501 Not Implemented"
 }
 
-bool RequestParser::parseStartLines(const QStringView data)
+bool RequestParser::parseStartLines(const QString &data)
 {
     // we don't handle malformed request which uses `LF` for newline
-    const QList<QStringView> lines = data.split(QString::fromLatin1(CRLF), Qt::SkipEmptyParts);
+    const QVector<QStringRef> lines = data.splitRef(CRLF, QString::SkipEmptyParts);
 
     // [rfc7230] 3.2.2. Field Order
     QStringList requestLines;
@@ -267,7 +267,7 @@ bool RequestParser::parsePostMessage(const QByteArray &data)
             return false;
         }
 
-        const QByteArray delimiter = Utils::String::unquote(QStringView(contentType).mid(idx + boundaryFieldName.size())).toLatin1();
+        const QByteArray delimiter = Utils::String::unquote(contentType.midRef(idx + boundaryFieldName.size())).toLatin1();
         if (delimiter.isEmpty())
         {
             qWarning() << Q_FUNC_INFO << "boundary delimiter field empty!";
@@ -276,7 +276,7 @@ bool RequestParser::parsePostMessage(const QByteArray &data)
 
         // split data by "dash-boundary"
         const QByteArray dashDelimiter = QByteArray("--") + delimiter + CRLF;
-        QVector<QByteArray> multipart = splitToViews(data, dashDelimiter, Qt::SkipEmptyParts);
+        QVector<QByteArray> multipart = splitToViews(data, dashDelimiter, QString::SkipEmptyParts);
         if (multipart.isEmpty())
         {
             qWarning() << Q_FUNC_INFO << "multipart empty";
@@ -299,7 +299,7 @@ bool RequestParser::parsePostMessage(const QByteArray &data)
 
 bool RequestParser::parseFormData(const QByteArray &data)
 {
-    const QVector<QByteArray> list = splitToViews(data, EOH, Qt::KeepEmptyParts);
+    const QVector<QByteArray> list = splitToViews(data, EOH, QString::KeepEmptyParts);
 
     if (list.size() != 2)
     {
@@ -311,13 +311,13 @@ bool RequestParser::parseFormData(const QByteArray &data)
     const QByteArray payload = viewWithoutEndingWith(list[1], CRLF);
 
     HeaderMap headersMap;
-    const QList<QStringView> headerLines = QStringView(headers).split(QString::fromLatin1(CRLF), Qt::SkipEmptyParts);
+    const QVector<QStringRef> headerLines = headers.splitRef(CRLF, QString::SkipEmptyParts);
     for (const auto &line : headerLines)
     {
-        if (line.trimmed().startsWith(QString::fromLatin1(HEADER_CONTENT_DISPOSITION), Qt::CaseInsensitive))
+        if (line.trimmed().startsWith(HEADER_CONTENT_DISPOSITION, Qt::CaseInsensitive))
         {
             // extract out filename & name
-            const QList<QStringView> directives = line.split(u';', Qt::SkipEmptyParts);
+            const QVector<QStringRef> directives = line.split(';', QString::SkipEmptyParts);
 
             for (const auto &directive : directives)
             {

src/base/http/requestparser.h

@@ -60,7 +60,7 @@ namespace Http
         RequestParser();
 
         ParseResult doParse(const QByteArray &data);
-        bool parseStartLines(QStringView data);
+        bool parseStartLines(const QString &data);
         bool parseRequestLine(const QString &line);
 
         bool parsePostMessage(const QByteArray &data);

src/base/http/server.h

@@ -43,7 +43,7 @@ namespace Http
     class Server final : public QTcpServer
     {
         Q_OBJECT
-        Q_DISABLE_COPY_MOVE(Server)
+        Q_DISABLE_COPY(Server)
 
     public:
         explicit Server(IRequestHandler *requestHandler, QObject *parent = nullptr);

src/base/http/types.h

@@ -35,44 +35,43 @@
 
 namespace Http
 {
-    inline const char METHOD_GET[] = "GET";
-    inline const char METHOD_POST[] = "POST";
+    const char METHOD_GET[] = "GET";
+    const char METHOD_POST[] = "POST";
 
-    inline const char HEADER_CACHE_CONTROL[] = "cache-control";
-    inline const char HEADER_CONNECTION[] = "connection";
-    inline const char HEADER_CONTENT_DISPOSITION[] = "content-disposition";
-    inline const char HEADER_CONTENT_ENCODING[] = "content-encoding";
-    inline const char HEADER_CONTENT_LENGTH[] = "content-length";
-    inline const char HEADER_CONTENT_SECURITY_POLICY[] = "content-security-policy";
-    inline const char HEADER_CONTENT_TYPE[] = "content-type";
-    inline const char HEADER_DATE[] = "date";
-    inline const char HEADER_HOST[] = "host";
-    inline const char HEADER_ORIGIN[] = "origin";
-    inline const char HEADER_REFERER[] = "referer";
-    inline const char HEADER_REFERRER_POLICY[] = "referrer-policy";
-    inline const char HEADER_SET_COOKIE[] = "set-cookie";
-    inline const char HEADER_X_CONTENT_TYPE_OPTIONS[] = "x-content-type-options";
-    inline const char HEADER_X_FORWARDED_FOR[] = "x-forwarded-for";
-    inline const char HEADER_X_FORWARDED_HOST[] = "x-forwarded-host";
-    inline const char HEADER_X_FRAME_OPTIONS[] = "x-frame-options";
-    inline const char HEADER_X_XSS_PROTECTION[] = "x-xss-protection";
+    const char HEADER_CACHE_CONTROL[] = "cache-control";
+    const char HEADER_CONNECTION[] = "connection";
+    const char HEADER_CONTENT_DISPOSITION[] = "content-disposition";
+    const char HEADER_CONTENT_ENCODING[] = "content-encoding";
+    const char HEADER_CONTENT_LENGTH[] = "content-length";
+    const char HEADER_CONTENT_SECURITY_POLICY[] = "content-security-policy";
+    const char HEADER_CONTENT_TYPE[] = "content-type";
+    const char HEADER_DATE[] = "date";
+    const char HEADER_HOST[] = "host";
+    const char HEADER_ORIGIN[] = "origin";
+    const char HEADER_REFERER[] = "referer";
+    const char HEADER_REFERRER_POLICY[] = "referrer-policy";
+    const char HEADER_SET_COOKIE[] = "set-cookie";
+    const char HEADER_X_CONTENT_TYPE_OPTIONS[] = "x-content-type-options";
+    const char HEADER_X_FORWARDED_HOST[] = "x-forwarded-host";
+    const char HEADER_X_FRAME_OPTIONS[] = "x-frame-options";
+    const char HEADER_X_XSS_PROTECTION[] = "x-xss-protection";
 
-    inline const char HEADER_REQUEST_METHOD_GET[] = "GET";
-    inline const char HEADER_REQUEST_METHOD_HEAD[] = "HEAD";
-    inline const char HEADER_REQUEST_METHOD_POST[] = "POST";
+    const char HEADER_REQUEST_METHOD_GET[] = "GET";
+    const char HEADER_REQUEST_METHOD_HEAD[] = "HEAD";
+    const char HEADER_REQUEST_METHOD_POST[] = "POST";
 
-    inline const char CONTENT_TYPE_HTML[] = "text/html";
-    inline const char CONTENT_TYPE_CSS[] = "text/css";
-    inline const char CONTENT_TYPE_TXT[] = "text/plain; charset=UTF-8";
-    inline const char CONTENT_TYPE_JS[] = "application/javascript";
-    inline const char CONTENT_TYPE_JSON[] = "application/json";
-    inline const char CONTENT_TYPE_GIF[] = "image/gif";
-    inline const char CONTENT_TYPE_PNG[] = "image/png";
-    inline const char CONTENT_TYPE_FORM_ENCODED[] = "application/x-www-form-urlencoded";
-    inline const char CONTENT_TYPE_FORM_DATA[] = "multipart/form-data";
+    const char CONTENT_TYPE_HTML[] = "text/html";
+    const char CONTENT_TYPE_CSS[] = "text/css";
+    const char CONTENT_TYPE_TXT[] = "text/plain; charset=UTF-8";
+    const char CONTENT_TYPE_JS[] = "application/javascript";
+    const char CONTENT_TYPE_JSON[] = "application/json";
+    const char CONTENT_TYPE_GIF[] = "image/gif";
+    const char CONTENT_TYPE_PNG[] = "image/png";
+    const char CONTENT_TYPE_FORM_ENCODED[] = "application/x-www-form-urlencoded";
+    const char CONTENT_TYPE_FORM_DATA[] = "multipart/form-data";
 
     // portability: "\r\n" doesn't guarantee mapping to the correct symbol
-    inline const char CRLF[] = {0x0D, 0x0A, '\0'};
+    const char CRLF[] = {0x0D, 0x0A, '\0'};
 
     struct Environment
     {
@@ -121,7 +120,7 @@ namespace Http
         HeaderMap headers;
         QByteArray content;
 
-        Response(uint code = 200, const QString &text = QLatin1String("OK"))
+        Response(uint code = 200, const QString &text = "OK")
             : status {code, text}
         {
         }

src/base/iconprovider.h

@@ -35,7 +35,7 @@ class QString;
 
 class IconProvider : public QObject
 {
-    Q_DISABLE_COPY_MOVE(IconProvider)
+    Q_DISABLE_COPY(IconProvider)
 
 public:
     static void initInstance();