Bump to 4.6.2

PR #19929.

.appveyor.yml

@@ -0,0 +1,101 @@
+version: '{branch}-{build}'
+
+# Do not build on tags (GitHub only)
+skip_tags: true
+
+image: Visual Studio 2022
+
+branches:
+  except:  # blacklist
+    - coverity_scan
+
+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
+
+# project directory
+clone_folder: *REPO_DIR
+
+# cache size should < 100MB (after compressing with fastest option):
+# see: https://www.appveyor.com/docs/build-cache#save-update-cache-before-build-finishes
+cache:
+  - *CACHE_DIR
+
+clone_depth: 50
+
+install:
+  # check if library needs update
+  - appveyor DownloadFile "%QBT_VER_URL%" -FileName "c:\version_new" && SET /P newVersion=<"c:\version_new"
+  - IF EXIST "%CACHE_DIR%\version" (SET /P oldVersion=<"%CACHE_DIR%\version")
+  - IF NOT EXIST "%CACHE_DIR%\version" (SET updateCache=1)
+  - IF NOT "%oldVersion%" == "%newVersion%" (SET updateCache=1)
+  # update library
+  - IF "%updateCache%" == "1" (ECHO "--- Will redownload libraries ---" &&
+      RMDIR /S /Q "%CACHE_DIR%" & MKDIR "%CACHE_DIR%" &&
+      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")
+
+before_build:
+  # setup env
+  - CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+  - SET PATH=%PATH%;C:\Qt\5.15.2\msvc2019_64\bin;%CACHE_DIR%\jom
+  # setup project
+  - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
+  # workarounds
+  - MKDIR "c:\qbt"
+  - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
+
+build_script:
+  - cd "%REPO_DIR%"
+  # lupdate chokes when it parses headers from system includes, especially Boost
+  # it also chokes with the sources from src/app/qtlocalpeer (formerly qtsingleapplication)
+  # Workaround: temporarily rename them to run lupdate with the .pro file
+  - RENAME conf.pri conf.pri.temp
+  - RENAME src\app\qtlocalpeer qtlocalpeer.temp
+  - lupdate qbittorrent.pro
+  - RENAME conf.pri.temp conf.pri
+  - RENAME src\app\qtlocalpeer.temp qtlocalpeer
+  - qmake qbittorrent.pro && cd src && qmake src.pro
+  - jom -j2 -f Makefile.Release
+
+after_build:
+  - cd "%REPO_DIR%"
+  - MKDIR upload
+  - COPY dist\windows\qt.conf upload
+  - COPY src\release\qbittorrent.exe upload
+  - COPY src\release\qbittorrent.pdb upload
+  - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.pdb" upload
+  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
+  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.pdb" upload
+  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.dll" upload
+  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.pdb" upload
+  - COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Network.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Sql.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Svg.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Widgets.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5WinExtras.dll upload
+  - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Xml.dll upload
+  - MKDIR upload\plugins\iconengines
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\iconengines\qsvgicon.dll upload\plugins\iconengines
+  - MKDIR upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qico.dll upload\plugins\imageformats
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\imageformats\qsvg.dll upload\plugins\imageformats
+  - MKDIR upload\plugins\platforms
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\platforms\qwindows.dll upload\plugins\platforms
+  - MKDIR upload\plugins\sqldrivers
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\sqldrivers\qsqlite.dll upload\plugins\sqldrivers
+  - MKDIR upload\plugins\styles
+  - COPY C:\Qt\5.15.2\msvc2019_64\plugins\styles\qwindowsvistastyle.dll upload\plugins\styles
+
+test: off
+
+artifacts:
+  - path: upload
+    name: qBittorrent-Appveyor_Windows-x64

.clang-tidy

@@ -35,6 +35,7 @@ Checks: >
   -modernize-use-auto,
   -modernize-use-nodiscard,
   -modernize-use-trailing-return-type,
+  -modernize-use-using,
   -readability-function-cognitive-complexity,
   -readability-function-size,
   -readability-identifier-length,

.editorconfig

@@ -1,10 +1,8 @@
-# EditorConfig is awesome: https://EditorConfig.org
+# EditorConfig is awesome: http://EditorConfig.org
 
 root = true
 
 [*]
-charset = utf-8
-end_of_line = lf
 indent_style = space
 indent_size = 4
 insert_final_newline = true

.gitattributes

@@ -6,5 +6,4 @@ core.eol=lf
 *.qm binary
 *.zip binary
 
-dist/windows/license.txt text eol=crlf
 test/testdata/crlf.txt text eol=crlf

.github/FUNDING.yml

@@ -1 +1 @@
-custom: "https://www.qbittorrent.org/donate"
+custom: "https://www.qbittorrent.org/donate.php"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,17 +7,19 @@ body:
         #### 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."
+        "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.
-        - Perform a **[search of the issue tracker (including closed ones)](https://github.com/qbittorrent/qBittorrent/issues?q=is%3Aissue+is%3Aopen+-label%3A%22Feature+request%22)** to avoid posting a duplicate.
+        - (Optional, but recommended) Verify that the issue is not fixed and is reproducible in the latest CI (currently only on **[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:
@@ -26,10 +28,10 @@ body:
         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.6.6 x64
-        Operating system: Windows 10 Pro x64 (22H2) 10.0.19045
-        Qt: 6.4.3
-        libtorrent-rasterbar: 1.2.19
+        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:
@@ -71,4 +73,4 @@ body:
         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: true
+      required: false

.github/SUPPORT.md

@@ -9,7 +9,7 @@ For such questions, use one of the following community support resources:
 
 * The [discussions section][discussions-url]
 
-* The [official forum][forum-url]
+* The official forum [official forum][forum-url]
 
 * The [qBittorrent subreddit][subreddit-url]
 

.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    commit-message:
-      prefix: "GHA CI"
-    groups:
-      github-actions:
-        patterns:
-          - "*"
-    labels:
-      - "CI"
-    schedule:
-      interval: "monthly"

.github/workflows/ci_file_health.yaml

@@ -12,60 +12,14 @@ jobs:
   ci:
     name: Check
     runs-on: ubuntu-latest
-    permissions:
-      security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
 
-      - name: Setup python
-        uses: actions/setup-python@v6
+      - name: Install tools
+        uses: actions/setup-python@v4
         with:
           python-version: "*"
 
       - name: Check files
-        uses: pre-commit/action@v3.0.1
-
-      - name: Check doc
-        env:
-          pandoc_path: "${{ github.workspace }}/../pandoc"
-        run: |
-          # install pandoc
-          curl \
-            -L \
-            -o "${{ runner.temp }}/pandoc.tar.gz" \
-            "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-amd64.tar.gz"
-          tar -xf "${{ runner.temp }}/pandoc.tar.gz" -C "${{ github.workspace }}/.."
-          mv "${{ github.workspace }}/.."/pandoc-* "${{ env.pandoc_path }}"
-          # run pandoc
-          for lang in doc/*/; do
-            "${{ env.pandoc_path }}/bin/pandoc" -f markdown -t man -s "$lang/qbittorrent.1.md" -o "$lang/qbittorrent.1"
-            "${{ env.pandoc_path }}/bin/pandoc" -f markdown -t man -s "$lang/qbittorrent-nox.1.md" -o "$lang/qbittorrent-nox.1"
-          done
-          # check diff, ignore "Automatically generated by ..." part
-          git diff -I '\.\\".*' --exit-code
-
-      - name: Check GitHub Actions workflow
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          pip install zizmor
-          IGNORE_RULEID='(.ruleId != "zizmor/template-injection")
-            and (.ruleId != "zizmor/unpinned-uses")'
-          IGNORE_ID='(.id != "zizmor/template-injection")
-            and (.id != "zizmor/unpinned-uses")'
-          zizmor \
-            --format sarif \
-            --persona auditor \
-            ./ \
-            | jq "(.runs[].results |= map(select($IGNORE_RULEID)))
-              | (.runs[].tool.driver.rules |= map(select($IGNORE_ID)))" \
-            > "${{ runner.temp }}/zizmor_results.sarif"
-
-      - name: Upload zizmor results
-        uses: github/codeql-action/upload-sarif@v3
-        with:
-          category: zizmor
-          sarif_file: "${{ runner.temp }}/zizmor_results.sarif"
+        uses: pre-commit/action@v3.0.0

.github/workflows/ci_macos.yaml

@@ -2,7 +2,8 @@ name: CI - macOS
 
 on: [pull_request, push]
 
-permissions: {}
+permissions:
+  actions: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -12,28 +13,27 @@ jobs:
   ci:
     name: Build
     runs-on: macos-latest
-    permissions:
-      actions: write
 
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.11", "1.2.20"]
+        libt_version: ["2.0.9", "1.2.19"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["6.9.1"]
+        qt_version: ["5.15.2", "6.5.0"]
+        exclude:
+          - libt_version: "1.2.19"
+            qt_version: "6.5.0"
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
-      libtorrent_path: "${{ github.workspace }}/../libtorrent"
+      openssl_root: /usr/local/opt/openssl@1.1
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
 
       - name: Install dependencies
-        uses: Wandalen/wretry.action@v3
+        uses: Wandalen/wretry.action@v1
         env:
            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
            HOMEBREW_NO_INSTALL_CLEANUP: 1
@@ -43,39 +43,26 @@ jobs:
           command: |
             brew update > /dev/null
             brew install \
-              openssl@3 zlib
-            # preinstalled on the image: cmake ninja
+              cmake ninja \
+              openssl@1.1 zlib
 
       - name: Setup ccache
         uses: Chocobo1/setup-ccache-action@v1
         with:
-          store_cache: ${{ github.ref == 'refs/heads/master' }}
+          store_cache: ${{ startsWith(github.ref, 'refs/heads/') }}
           update_packager_index: false
-          ccache_options: |
-            max_size=1G
 
       - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "86"
-          BOOST_PATCH_VERSION: "0"
         run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          set +e
-          curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
-          tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          if [ "$_exitCode" -ne "0" ]; then
-            curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url2"
-            tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          fi
+          curl \
+            -L \
+            -o "${{ runner.temp }}/boost.tar.bz2" \
+            "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2"
+          tar -xf "${{ runner.temp }}/boost.tar.bz2" -C "${{ github.workspace }}/.."
           mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
-          cd "${{ env.boost_path }}"
-          ./bootstrap.sh
-          ./b2 stage --stagedir=./ --with-headers
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_version }}
           archives: qtbase qtdeclarative qtsvg qttools
@@ -88,31 +75,53 @@ jobs:
             --branch v${{ matrix.libt_version }} \
             --depth 1 \
             --recurse-submodules \
-            https://github.com/arvidn/libtorrent.git \
-            ${{ env.libtorrent_path }}
-          cd ${{ env.libtorrent_path }}
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
           cmake \
             -B build \
             -G "Ninja" \
             -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_CXX_STANDARD=20 \
+            -DCMAKE_CXX_STANDARD=17 \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
-            -Ddeprecated-functions=OFF
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -Ddeprecated-functions=OFF \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}"
           cmake --build build
           sudo cmake --install build
 
-      - name: Build qBittorrent
+      - name: Build qBittorrent (Qt5)
+        if: startsWith(matrix.qt_version, 5)
         run: |
-          CXXFLAGS="$CXXFLAGS -DQT_FORCE_ASSERTS -Werror -Wno-error=deprecated-declarations" \
+          CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
           LDFLAGS="$LDFLAGS -gz" \
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
+            -DTESTING=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
+          cmake --build build
+          cmake --build build --target check
+
+      - name: Build qBittorrent (Qt6)
+        if: startsWith(matrix.qt_version, 6)
+        run: |
+          CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
+          LDFLAGS="$LDFLAGS -gz" \
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DBOOST_ROOT="${{ env.boost_path }}" \
+            -DOPENSSL_ROOT_DIR="${{ env.openssl_root }}" \
+            -DQT6=ON \
             -DTESTING=ON \
             -DVERBOSE_CONFIGURE=ON \
             -D${{ matrix.qbt_gui }}
@@ -122,30 +131,13 @@ jobs:
 
       - name: Prepare build artifacts
         run: |
+          # create .dmg
           appName="qbittorrent"
           if [ "${{ matrix.qbt_gui }}" = "GUI=OFF" ]; then
             appName="qbittorrent-nox"
           fi
           pushd build
-          # packaging
-          macdeployqt "$appName.app" -no-strip
-          # code signing
-          xattr -cr "$appName.app"
-          codesign --force --sign - \
-            "$appName.app" \
-            "$appName.app/Contents/Frameworks"/* \
-            "$appName.app/Contents/MacOS/$appName"
-          codesign --verify --deep --strict -v "$appName.app"
-          # create .dmg
-          PACKAGE_RETRY=0
-          while [ "$PACKAGE_RETRY" -lt "3" ]; do
-            if hdiutil create -fs HFS+ -srcfolder "$appName.app" -volname "$appName" "$appName.dmg"; then
-              break
-            fi
-            sleep 5
-            PACKAGE_RETRY=$((PACKAGE_RETRY + 1))
-            echo "Retry $PACKAGE_RETRY..."
-          done
+          macdeployqt "$appName.app" -dmg -no-strip
           popd
           # prepare upload folder
           mkdir upload
@@ -153,10 +145,10 @@ jobs:
           mkdir upload/cmake
           cp build/compile_commands.json upload/cmake
           mkdir upload/cmake/libtorrent
-          cp ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
           path: upload

.github/workflows/ci_python.yaml

@@ -1,83 +0,0 @@
-name: CI - Python
-
-on: [pull_request, push]
-
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.head_ref != '' }}
-
-jobs:
-  ci:
-    name: Check
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
-
-      - name: Setup python (auxiliary scripts)
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3'  # use default version
-
-      - name: Install tools (auxiliary scripts)
-        run: pip install bandit isort pycodestyle pyflakes
-
-      - name: Gather files (auxiliary scripts)
-        run: |
-          export "PY_FILES=$(find . -type f -name '*.py' ! -path '*searchengine*' -printf '%p ')"
-          echo $PY_FILES
-          echo "PY_FILES=$PY_FILES" >> "$GITHUB_ENV"
-
-      - name: Lint code (auxiliary scripts)
-        run: |
-          pyflakes $PY_FILES
-          bandit --skip B101,B314,B405 $PY_FILES
-
-      - name: Format code (auxiliary scripts)
-        run: |
-          pycodestyle \
-            --max-line-length=1000 \
-            --statistics \
-            $PY_FILES
-          isort \
-             --check \
-             --diff \
-             $PY_FILES
-
-      - name: Build code (auxiliary scripts)
-        run: |
-          python -m compileall $PY_FILES
-
-      - name: Setup python (search engine)
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.9'
-
-      - name: Install tools (search engine)
-        working-directory: src/searchengine/nova3
-        run: |
-          pip install uv
-          uv sync
-
-      - name: Check typings (search engine)
-        working-directory: src/searchengine/nova3
-        run: uv run just check
-
-      - name: Lint code (search engine)
-        working-directory: src/searchengine/nova3
-        run: uv run just lint
-
-      - name: Format code (search engine)
-        working-directory: src/searchengine/nova3
-        run: |
-          uv run just format
-          git diff --exit-code
-
-      - name: Build code (search engine)
-        working-directory: src/searchengine/nova3
-        run: uv run just build

.github/workflows/ci_ubuntu.yaml

@@ -2,7 +2,9 @@ name: CI - Ubuntu
 
 on: [pull_request, push]
 
-permissions: {}
+permissions:
+  actions: write
+  security-events: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -12,68 +14,41 @@ jobs:
   ci:
     name: Build
     runs-on: ubuntu-latest
-    permissions:
-      actions: write
-      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.11", "1.2.20"]
+        libt_version: ["2.0.9", "1.2.19"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["6.6.3"]
-
-    env:
-      boost_path: "${{ github.workspace }}/../boost"
-      harden_flags: "-D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS"
-      libtorrent_path: "${{ github.workspace }}/../libtorrent"
+        qt_version: ["5.15.2", "6.2.0"]
+        exclude:
+          - libt_version: "1.2.19"
+            qt_version: "6.2.0"
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install \
-            build-essential cmake ninja-build \
-            libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev libxkbcommon-x11-dev zlib1g-dev
 
       - name: Setup ccache
         uses: Chocobo1/setup-ccache-action@v1
         with:
-          store_cache: ${{ github.ref == 'refs/heads/master' }}
+          store_cache: ${{ startsWith(github.ref, 'refs/heads/') }}
           update_packager_index: false
           ccache_options: |
-            max_size=1G
-
-      - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "77"
-          BOOST_PATCH_VERSION: "0"
-        run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          set +e
-          curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
-          tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          if [ "$_exitCode" -ne "0" ]; then
-            curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url2"
-            tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          fi
-          mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
-          cd "${{ env.boost_path }}"
-          ./bootstrap.sh
-          ./b2 stage --stagedir=./ --with-headers
+            max_size=2G
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_version }}
-          archives: icu qtbase qtdeclarative qtsvg qttools
+          archives: icu qtbase qtsvg qttools
           cache: true
 
       - name: Install libtorrent
@@ -82,40 +57,36 @@ jobs:
             --branch v${{ matrix.libt_version }} \
             --depth 1 \
             --recurse-submodules \
-            https://github.com/arvidn/libtorrent.git \
-            ${{ env.libtorrent_path }}
-          cd ${{ env.libtorrent_path }}
-          CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }}" \
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
           cmake \
             -B build \
             -G "Ninja" \
             -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_CXX_STANDARD=20 \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
             -Ddeprecated-functions=OFF
           cmake --build build
           sudo cmake --install build
 
       # to avoid scanning 3rdparty codebases, initialize it just before building qbt
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
+        uses: github/codeql-action/init@v2
+        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
         with:
           config-file: ./.github/workflows/helper/codeql/cpp.yaml
           languages: cpp
 
-      - name: Build qBittorrent
+      - name: Build qBittorrent (Qt5)
+        if: startsWith(matrix.qt_version, 5)
         run: |
-          CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }} -DQT_FORCE_ASSERTS -Werror" \
+          CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
           LDFLAGS="$LDFLAGS -gz" \
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
             -DCMAKE_INSTALL_PREFIX="/usr" \
             -DTESTING=ON \
             -DVERBOSE_CONFIGURE=ON \
@@ -125,9 +96,29 @@ jobs:
           cmake --build build --target check
           DESTDIR="qbittorrent" cmake --install build
 
+      - name: Build qBittorrent (Qt6)
+        if: startsWith(matrix.qt_version, 6)
+        run: |
+          CXXFLAGS="$CXXFLAGS -Werror" \
+          LDFLAGS="$LDFLAGS -gz" \
+          cmake \
+            -B build \
+            -G "Ninja" \
+            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+            -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DCMAKE_INSTALL_PREFIX="/usr" \
+            -DQT6=ON \
+            -DTESTING=ON \
+            -DVERBOSE_CONFIGURE=ON \
+            -D${{ matrix.qbt_gui }}
+          cmake --build build --target qbt_update_translations
+          cmake --build build
+          cmake --build build --target check
+          DESTDIR="qbittorrent" cmake --install build
+
       - name: Run CodeQL analysis
-        uses: github/codeql-action/analyze@v3
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
+        uses: github/codeql-action/analyze@v2
+        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
         with:
           category: ${{ github.base_ref || github.ref_name }}
 
@@ -137,41 +128,37 @@ jobs:
           mkdir upload/cmake
           cp build/compile_commands.json upload/cmake
           mkdir upload/cmake/libtorrent
-          cp ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
+          cp libtorrent/build/compile_commands.json upload/cmake/libtorrent
 
-      - name: Install AppImage
+      - name: 'AppImage: Prepare env'
         run: |
-          curl \
-            -L \
-            -Z \
-            -O https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage \
-            -O https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage \
-            -O https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
-          chmod +x \
-            linuxdeploy-x86_64.AppImage \
-            linuxdeploy-plugin-qt-x86_64.AppImage \
-            linuxdeploy-plugin-appimage-x86_64.AppImage
+          sudo apt install libfuse2
+          wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+          wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+          wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-x86_64.AppImage
+          chmod +x linuxdeploy-x86_64.AppImage
+          chmod +x linuxdeploy-plugin-qt-x86_64.AppImage
+          chmod +x linuxdeploy-plugin-appimage-x86_64.AppImage
 
-      - name: Prepare files for AppImage
+      - name: 'AppImage: Prepare nox'
         if: matrix.qbt_gui == 'GUI=OFF'
         run: |
-          mkdir -p qbittorrent/usr/share/applications
-          cp .github/workflows/helper/appimage/org.qbittorrent.qBittorrent.desktop qbittorrent/usr/share/applications/org.qbittorrent.qBittorrent.desktop
-          mkdir -p qbittorrent/usr/share/icons/hicolor/scalable/apps
+          mkdir -p qbittorrent/usr/share/icons/hicolor/scalable/apps/
+          mkdir -p qbittorrent/usr/share/applications/
           cp dist/unix/menuicons/scalable/apps/qbittorrent.svg qbittorrent/usr/share/icons/hicolor/scalable/apps/qbittorrent.svg
+          cp .github/workflows/helper/appimage/org.qbittorrent.qBittorrent.desktop qbittorrent/usr/share/applications/org.qbittorrent.qBittorrent.desktop
 
-      - name: Package AppImage
+      - name: 'AppImage: Package'
         run: |
-          rm -f "${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/sqldrivers/libqsqlmimer.so"
-          ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --plugin qt
+          ./linuxdeploy-x86_64.AppImage --appdir=qbittorrent --plugin qt
           rm qbittorrent/apprun-hooks/*
           cp .github/workflows/helper/appimage/export_vars.sh qbittorrent/apprun-hooks/export_vars.sh
           NO_APPSTREAM=1 \
-            OUTPUT=upload/qbittorrent-CI_Ubuntu_x86_64.AppImage \
-            ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --output appimage
+          OUTPUT=upload/qbittorrent-CI_Ubuntu_x86_64.AppImage \
+          ./linuxdeploy-x86_64.AppImage --appdir=qbittorrent --output appimage
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
           path: upload

.github/workflows/ci_webui.yaml

@@ -2,7 +2,8 @@ name: CI - WebUI
 
 on: [pull_request, push]
 
-permissions: {}
+permissions:
+  security-events: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -12,8 +13,6 @@ jobs:
   ci:
     name: Check
     runs-on: ubuntu-latest
-    permissions:
-      security-events: write
 
     defaults:
       run:
@@ -21,43 +20,29 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
 
       - name: Setup nodejs
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v3
         with:
           node-version: 'lts/*'
 
       - name: Install tools
-        run: |
-          npm install
-          npm ls
-          echo "::group::npm ls --all"
-          npm ls --all
-          echo "::endgroup::"
-
-      - name: Run tests
-        run: npm test
+        run: npm install
 
       - name: Lint code
-        if: ${{ !cancelled() }}
         run: npm run lint
 
       - name: Format code
-        if: ${{ !cancelled() }}
         run: |
           npm run format
           git diff --exit-code
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        if: ${{ !cancelled() }}
+        uses: github/codeql-action/init@v2
         with:
-          config-file: .github/workflows/helper/codeql/js.yaml
+          config-file: ./.github/workflows/helper/codeql/js.yaml
           languages: javascript
 
       - name: Run CodeQL analysis
-        if: ${{ !cancelled() }}
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

.github/workflows/coverity-scan.yaml

@@ -12,88 +12,48 @@ jobs:
     name: Scan
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        libt_version: ["2.0.11"]
-        qbt_gui: ["GUI=ON"]
-        qt_version: ["6.9.1"]
-
-    env:
-      boost_path: "${{ github.workspace }}/../boost"
-      coverity_path: "${{ github.workspace }}/../coverity"
-      libtorrent_path: "${{ github.workspace }}/../libtorrent"
-
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
-        with:
-          persist-credentials: false
+        uses: actions/checkout@v3
 
       - name: Install dependencies
         run: |
           sudo apt update
           sudo apt install \
-            build-essential cmake ninja-build \
-            libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev
-
-      - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "88"
-          BOOST_PATCH_VERSION: "0"
-        run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
-          set +e
-          curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
-          tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          if [ "$_exitCode" -ne "0" ]; then
-            curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url2"
-            tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
-          fi
-          mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
-          cd "${{ env.boost_path }}"
-          ./bootstrap.sh
-          ./b2 stage --stagedir=./ --with-headers
+            build-essential cmake ninja-build pkg-config \
+            libboost-dev libssl-dev zlib1g-dev
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4
+        uses: jurplel/install-qt-action@v3
         with:
-          version: ${{ matrix.qt_version }}
-          archives: icu qtbase qtdeclarative qtsvg qttools
-          cache: true
+          version: "6.5.0"
+          archives: icu qtbase qtsvg qttools
 
       - name: Install libtorrent
         run: |
           git clone \
-            --branch v${{ matrix.libt_version }} \
+            --branch "v2.0.9" \
             --depth 1 \
             --recurse-submodules \
-            https://github.com/arvidn/libtorrent.git \
-            ${{ env.libtorrent_path }}
-          cd ${{ env.libtorrent_path }}
+            https://github.com/arvidn/libtorrent.git
+          cd libtorrent
           cmake \
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_CXX_STANDARD=20 \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
             -Ddeprecated-functions=OFF
           cmake --build build
           sudo cmake --install build
 
       - name: Download Coverity Build Tool
         run: |
-          curl \
-            -L \
-            -d "token=${{ secrets.COVERITY_SCAN_TOKEN }}&project=qbittorrent%2FqBittorrent" \
-            -o "${{ runner.temp }}/coverity_tool.tgz" \
-            "https://scan.coverity.com/download/linux64"
-          mkdir -p ${{ env.coverity_path }}
-          tar \
-            -xf "${{ runner.temp }}/coverity_tool.tgz" \
-            -C "${{ env.coverity_path }}" \
-            --strip-components 1
+          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: |
@@ -101,13 +61,11 @@ jobs:
             -B build \
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
-            -DVERBOSE_CONFIGURE=ON \
-            -D${{ matrix.qbt_gui }}
-          PATH="${{ env.coverity_path }}/bin:$PATH" \
-          cov-build \
-            --dir cov-int \
-            cmake --build build
+            -DGUI=ON \
+            -DQT6=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: |

.github/workflows/helper/pre-commit/.typos.toml

@@ -16,5 +16,3 @@ ths = "ths"
 [default.extend-words]
 BA = "BA"
 helo = "helo"
-Pn = "Pn"
-UIU = "UIU"

.github/workflows/helper/pre-commit/check_grid_items_order.py

@@ -1,95 +0,0 @@
-#!/usr/bin/env python3
-
-# A pre-commit hook for checking items order in grid layouts
-# Copyright (C) 2024  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.
-
-import argparse
-import re
-import sys
-import xml.etree.ElementTree as ElementTree
-from collections.abc import Callable, Sequence
-from typing import Optional
-
-
-def traversePostOrder(root: ElementTree.Element, visitFunc: Callable[[ElementTree.Element], None]) -> None:
-    stack = [(root, False)]
-
-    while len(stack) > 0:
-        (element, visit) = stack.pop()
-        if visit:
-            visitFunc(element)
-        else:
-            stack.append((element, True))
-            stack.extend((child, False) for child in reversed(element))
-
-
-def modifyElement(element: ElementTree.Element) -> None:
-    def getSortKey(e: ElementTree.Element) -> tuple[int, int]:
-        if e.tag == 'item':
-            return (int(e.attrib['row']), int(e.attrib['column']))
-        return (-1, -1)  # don't care
-
-    if element.tag == 'layout' and element.attrib['class'] == 'QGridLayout' and len(element) > 0:
-        element[:] = sorted(element, key=getSortKey)
-
-    # workaround_2a: ElementTree will unescape `"` and we need to escape it back
-    if element.tag == 'string' and element.text is not None:
-        element.text = element.text.replace('"', '"')
-
-
-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)
-
-    for filename in args.filenames:
-        with open(filename, 'r+') as f:
-            orig = f.read()
-            root = ElementTree.fromstring(orig)
-            traversePostOrder(root, modifyElement)
-            ElementTree.indent(root, ' ')
-
-            # workaround_1: cannot use `xml_declaration=True` since it uses single quotes instead of Qt preferred double quotes
-            ret = f'<?xml version="1.0" encoding="UTF-8"?>\n{ElementTree.tostring(root, 'unicode')}\n'
-
-            # workaround_2b: ElementTree will turn `&quot;` into `&amp;quot;`, so revert it back
-            ret = ret.replace('&amp;quot;', '&quot;')
-
-            # workaround_3: Qt prefers no whitespaces in self-closing tags
-            ret = re.sub('<(.+) +/>', r'<\1/>', ret)
-
-            if ret != orig:
-                print(f'Tip: run this script to apply the fix: `python {__file__} {filename}`', file=sys.stderr)
-
-                f.seek(0)
-                f.write(ret)
-                f.truncate()
-
-    return 0
-
-
-if __name__ == '__main__':
-    sys.exit(main())

.github/workflows/helper/pre-commit/check_translation_tag.py

@@ -26,12 +26,9 @@
 # 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
-import sys
-from collections.abc import Sequence
-from typing import Optional
-
 
 def main(argv: Optional[Sequence[str]] = None) -> int:
     parser = argparse.ArgumentParser()
@@ -50,12 +47,12 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
                 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")
+                              f"Line: {line_counter}\n"
+                              f"Column span: {match.span()}\n"
+                              f"Part: \"{match.group()}\"\n\n")
                     line_counter += 1
 
-            except UnicodeDecodeError:
+            except UnicodeDecodeError as error:
                 # not a text file, skip
                 continue
 
@@ -67,6 +64,5 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
 
     return 0
 
-
 if __name__ == '__main__':
-    sys.exit(main())
+    exit(main())

.github/workflows/stale_bot.yaml

@@ -4,16 +4,15 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
-permissions: {}
+permissions:
+  pull-requests: write
 
 jobs:
   stale:
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
     steps:
       - name: Mark and close stale PRs
-        uses: actions/stale@v10
+        uses: actions/stale@v8
         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."

.gitignore

@@ -1,5 +1,3 @@
-.vscode/
-
 src/gui/geoip/GeoIP.dat
 src/gui/geoip/GeoIP.dat.gz
 src/qbittorrent
@@ -11,13 +9,13 @@ CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri
 Makefile*
+*.pyc
 *.log
 
 # Compiled object files
 *.o
 *.pdb
 *.exe
-*.dll
 
 # Generated MOC, resource and UI files
 moc_*.cpp
@@ -25,7 +23,8 @@ moc_*.h
 qrc_*.cpp
 ui_*.h
 *.moc
-*.qm
+src/lang/qbittorrent_*.qm
+src/webui/www/translations/webui_*.qm
 .DS_Store
 .qmake.stash
 src/qbittorrent.app
@@ -41,3 +40,7 @@ src/icons/skin/build-icons/icons/*.png
 
 # CMake build directory
 build/
+
+# Web UI tools
+node_modules
+package-lock.json

.pre-commit-config.yaml

@@ -1,12 +1,6 @@
 repos:
   - repo: local
     hooks:
-      - id: check-grid-order
-        name: Check items order in grid layouts
-        entry: .github/workflows/helper/pre-commit/check_grid_items_order.py
-        language: script
-        files: \.ui$
-
       - id: check-translation-tag
         name: Check newline characters in <translation> tag
         entry: .github/workflows/helper/pre-commit/check_translation_tag.py
@@ -19,7 +13,7 @@ repos:
           - ts
 
   - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v6.0.0
+    rev: v4.4.0
     hooks:
     - id: check-json
       name: Check JSON files
@@ -41,7 +35,6 @@ repos:
         (?x)^(
           src/webui/www/private/css/lib/.* |
           src/webui/www/private/scripts/lib/.* |
-          dist/windows/license.txt |
           test/testdata/crlf.txt
         )$
 
@@ -68,18 +61,20 @@ repos:
       exclude_types:
         - ts
 
-  - repo: https://github.com/codespell-project/codespell.git
-    rev: v2.4.1
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.5
     hooks:
     - id: codespell
       name: Check spelling (codespell)
-      args: ["--ignore-words-list", "additionals,categor,curren,fo,indexIn,ist,ket,notin,searchin,sectionin,superseeding,te,ths"]
+      args: ["--ignore-words-list", "additionals,curren,fo,ket,superseeding,te,ths"]
       exclude: |
         (?x)^(
           .*\.desktop |
           .*\.qrc |
+          build-aux/.* |
           Changelog |
           dist/windows/installer-translations/.* |
+          m4/.* |
           src/base/3rdparty/.* |
           src/searchengine/nova3/socks.py |
           src/webui/www/private/scripts/lib/.*
@@ -87,8 +82,8 @@ repos:
       exclude_types:
         - ts
 
-  - repo: https://github.com/crate-ci/typos.git
-    rev: v1.35.3
+  - repo: https://github.com/crate-ci/typos
+    rev: v1.15.5
     hooks:
     - id: typos
       name: Check spelling (typos)
@@ -99,8 +94,11 @@ repos:
           .*\.desktop |
           .*\.qrc |
           \.pre-commit-config\.yaml |
+          build-aux/.* |
           Changelog |
+          configure.* |
           dist/windows/installer-translations/.* |
+          m4/.* |
           src/base/3rdparty/.* |
           src/searchengine/nova3/socks.py |
           src/webui/www/private/scripts/lib/.*

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_master]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_v46x]
 file_filter  = src/lang/qbittorrent_<lang>.ts
 source_file  = src/lang/qbittorrent_en.ts
 source_lang  = en
@@ -9,7 +9,7 @@ type         = QT
 minimum_perc = 23
 lang_map     = pt: pt_PT, zh: zh_CN
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui_v46x]
 file_filter  = src/webui/www/translations/webui_<lang>.ts
 source_file  = src/webui/www/translations/webui_en.ts
 source_lang  = en

AUTHORS

@@ -53,7 +53,7 @@ Images Authors:
 
 * file: src/icons/qbittorrent-tray-dark.svg src/icons/qbittorrent-tray-light.svg
   copyright: Daniel Eguren <deguren@gmail.com>
-  modified by: now-im <now-im.d8gcu@simplelogin.com> (@now-im)
+  modified by: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im)
   license: LGPL
 
 * folder: src/icons/
@@ -63,7 +63,7 @@ Images Authors:
          media-seek-forward.svg, network-connect.svg, object-locked.svg, queued.svg, ratio.svg, reannounce.svg, slow_off.svg, slow.svg,
          speedometer.svg, system-log-out.svg, tags.svg, task-complete.svg, task-reject.svg, tracker-error.svg, tracker-warning.svg,
          trackerless.svg, trackers.svg, view-categories.svg
-  copyright: now-im <now-im.d8gcu@simplelogin.com> (@now-im) modified from La-Capitaine icon theme (https://github.com/keeferrourke/la-capitaine-icon-theme)
+  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from La-Capitaine icon theme (https://github.com/keeferrourke/la-capitaine-icon-theme)
   license: GPLv3+
 
 * folder: src/icons/
@@ -76,18 +76,18 @@ Images Authors:
          name.svg, network-server.svg, office-chart-line.svg, plugins.svg, preferences-desktop.svg, preferences-other.svg,
          preferences-system-network.svg, security-high.svg, security-low.svg, set-location.svg, torrent-creator.svg, user-group-delete.svg,
          user-group-new.svg, view-preview.svg, view-refresh.svg, view-statistics.svg, wallet-open.svg, webui.svg
-  copyright: now-im <now-im.d8gcu@simplelogin.com> (@now-im) modified from Ionicons icon theme (https://github.com/ionic-team/ionicons)
+  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from Ionicons icon theme (https://github.com/ionic-team/ionicons)
   license: MIT
 
 * folder: src/icons/
   files: force-recheck.svg
-  copyright: now-im <now-im.d8gcu@simplelogin.com> (@now-im) modified from Font-Awesome icon theme (https://github.com/FortAwesome/Font-Awesome)
+  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im) modified from Font-Awesome icon theme (https://github.com/FortAwesome/Font-Awesome)
   license: CC BY 4.0 License
 
 * folder: src/icons/
   files: downloading.svg, edit-clear.svg, error.svg, filter-active.svg, filter-inactive.svg, filter-stalled.svg, kt-set-max-download-speed.svg,
          kt-set-max-upload-speed.svg, list-add.svg, preferences-web-browser-cookies.svg, stalledDL.svg, stalledUP.svg
-  copyright: now-im <now-im.d8gcu@simplelogin.com> (@now-im)
+  copyright: Nowshed H. Imran <nowshed.imran@gmail.com> (@now-im)
   license: BSD 2-Clause License
 
 Translations authors:

CMakeLists.txt

@@ -7,13 +7,15 @@ project(qBittorrent
 )
 
 # version requirements - older versions may work, but you are on your own
-set(minBoostVersion 1.76)
-set(minQt6Version 6.6.0)
-set(minOpenSSLVersion 3.0.2)
+set(minBoostVersion 1.71)
+set(minQt5Version 5.15.2)
+set(minQt6Version 6.2)
+set(minOpenSSLVersion 1.1.1)
 set(minLibtorrent1Version 1.2.19)
-set(minLibtorrentVersion 2.0.10)
+set(minLibtorrentVersion 2.0.9)
 set(minZlibVersion 1.2.11)
 
+include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
 include(GNUInstallDirs)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
@@ -23,6 +25,7 @@ include(FeatureOptionsSetup)
 # features, list is loosely sorted by user's interests
 feature_option(GUI "Build GUI application" ON)
 feature_option(WEBUI "Enable built-in HTTP server for remote control" ON)
+feature_option(QT6 "Build with Qt 6 instead of Qt 5" OFF)
 feature_option(STACKTRACE "Enable stacktrace support" ON)
 feature_option(TESTING "Build internal testing suite" OFF)
 feature_option(VERBOSE_CONFIGURE "Show information about PACKAGES_FOUND and PACKAGES_NOT_FOUND in the configure output (only useful for debugging the CMake build scripts)" OFF)

CODING_GUIDELINES.md

@@ -276,7 +276,7 @@ struct StructName {};
 
 enum EnumName {};
 
-using SomeList = QList<ClassName>;
+typedef QList<ClassName> SomeList;
 
 namespace NamespaceName
 {
@@ -318,7 +318,7 @@ The headers should be ordered alphabetically within each group. \
 If there are conditionals for the same header group, then put them at the bottom of the respective group. \
 If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
-One exception is the header containing the library version (for example, QtVersionChecks), this particular header isn't constrained by the aforementioned order.
+One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
 Example:
 
@@ -331,7 +331,7 @@ Example:
 // exceptions, headers containing version number
 #include <boost/version.hpp>
 #include <libtorrent/version.hpp>
-#include <QtVersionChecks>
+#include <QtGlobal>
 
 // C++ Standard Library headers
 #include <cstdio>
@@ -342,7 +342,7 @@ Example:
 
 // System headers
 #ifdef Q_OS_WIN
-#include <windows.h>
+#include <Windows.h>
 #endif
 
 // Boost library headers

COPYING.GPLv2

@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- <https://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,7 +304,8 @@ the "copyright" line and a pointer to where the full notice is found.
     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, see <https://www.gnu.org/licenses/>.
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -328,8 +329,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Moe Ghoul>, 1 April 1989
-  Moe Ghoul, President of Vice
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

INSTALL

@@ -3,22 +3,22 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
 1) Install these dependencies:
 
-  - Boost >= 1.76
+  - Boost >= 1.71
 
-  - libtorrent-rasterbar 1.2.19 - 1.2.x || 2.0.10 - 2.0.x
+  - libtorrent-rasterbar 1.2.19 - 1.2.x || 2.0.9 - 2.0.x
       * By Arvid Norberg, https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
-  - OpenSSL >= 3.0.2
+  - OpenSSL >= 1.1.1
 
-  - Qt 6.6.0 - 6.x
+  - Qt 5.15.2 - 5.x || 6.2.0 - 6.x
 
   - zlib >= 1.2.11
 
-  - CMake >= 3.16
-      * Compile-time only
+  - pkg-config *
+      * Compile-time only on *nix systems
 
-  - Python >= 3.9.0
+  - Python >= 3.7.0
       * Optional, run-time only
       * Used by the bundled search engine
 
@@ -28,18 +28,16 @@ Please ensure you are building with an officially supported configuration when r
 
 2a) Compile and install qBittorrent with Qt graphical interface
 
-  $ cmake -B build -DCMAKE_BUILD_TYPE=Release
-  $ cmake --build build
-  $ cmake --install build
+  $ ./configure
+  $ make && make install
   $ qbittorrent
 
   will install and execute qBittorrent.
 
 2b) Compile and install qBittorrent without Qt graphical interface
 
-  $ cmake -B build -DCMAKE_BUILD_TYPE=Release -DGUI=OFF
-  $ cmake --build build
-  $ cmake --install build
+  $ ./configure --disable-gui
+  $ make && make install
   $ qbittorrent-nox
 
   will install and execute qBittorrent.

README.md

@@ -1,7 +1,8 @@
 qBittorrent - A BitTorrent client in Qt
 ------------------------------------------
 
-[![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/actions/workflows/ci_ubuntu.yaml/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
+[![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
+[![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
 [![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
 ********************************
 ### Description:
@@ -15,8 +16,15 @@ support as well as many features.
 The free [IP to Country Lite database](https://db-ip.com/db/download/ip-to-country-lite) by [DB-IP](https://db-ip.com/) is used for resolving the countries of peers. The database is licensed under the [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/).
 
 ### Installation:
+For installation, follow the instructions from INSTALL file, but simple:
 
-Refer to the [INSTALL](INSTALL) file.
+```
+./configure
+make && make install
+qbittorrent
+```
+
+will install and execute qBittorrent hopefully without any problem.
 
 ### Public key:
 Starting from v3.3.4 all source tarballs and binaries are signed.<br />

SECURITY.md

@@ -1,18 +0,0 @@
-# Security Policy
-
-qBittorrent takes the security of our software seriously, including all source code repositories managed through our GitHub organisation.
-If you believe you have found a security vulnerability in qBittorrent, please report it to us as described below.
-
-## Reporting Security Issues
-
-Please do not report security vulnerabilities through public GitHub issues. Instead, please use GitHubs private vulnerability reporting functionality associated to this repository. Additionally, you may email us with all security-related inquiries and notifications at `security@qbittorrent.org`.
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-1. Type of issue
-2. Step-by-step instructions to reproduce the issue
-3. Proof-of-concept or exploit code (if possible)
-4. Potential impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly. Any and all CVEs will be requested and issued through GitHubs private vulnerability reporting functionality, which will be published alongside the disclosure.
-
-This security policy only applies to the most recent stable branch of qBittorrent. Flaws in old versions that are not present in the current stable branch will not be fixed.

WebAPI_Changelog.md

@@ -1,88 +0,0 @@
-# WebAPI Changelog
-
-## 2.14.0
-* [#23202](https://github.com/qbittorrent/qBittorrent/pull/23202)
-  * WebAPI responds with the error message "Endpoint does not exist" when the endpoint does not exist, to better differentiate from unrelated Not Found (i.e. 404) responses
-  * `auth/login` endpoint responds to invalid credentials with a 401
-  * `torrents/add` endpoint responds with `success_count`, `pending_count`, `failure_count`, and `added_torrent_ids`
-    * When `pending_count` is non-zero, response code 202 is used
-    * When all torrents fail to be added, response code 409 is used
-
-## 2.13.1
-* [#23163](https://github.com/qbittorrent/qBittorrent/pull/23163)
-  * `torrents/add` endpoint now supports downloading from a search plugin via the `downloader` parameter
-  * `torrents/fetchMetadata` endpoint now supports fetching from a search plugin via the `downloader` parameter
-* [#23088](https://github.com/qbittorrent/qBittorrent/pull/23088)
-  * Add `clientdata/load` and `clientdata/store` endpoints for managing WebUI-specific client settings and other shared data
-
-## 2.13.0
-* [#23045](https://github.com/qbittorrent/qBittorrent/pull/23045)
-  * `torrents/trackers` returns three new fields: `next_announce`, `min_announce` and `endpoints`
-    * `endpoints` is an array of tracker endpoints, each with `name`, `updating`, `status`, `msg`, `bt_version`, `num_peers`, `num_peers`, `num_leeches`, `num_downloaded`, `next_announce` and `min_announce` fields
-  *  `torrents/trackers` now returns `5` and `6` in `status` field as possible values
-    * `5` for `Tracker error` and `6` for `Unreachable`
-* [#22963](https://github.com/qbittorrent/qBittorrent/pull/22963)
-  * `torrents/editTracker` endpoint now supports setting a tracker's tier via `tier` parameter
-  * `torrents/editTracker` endpoint always responds with a 204 when successful
-  * `torrents/editTracker` endpoint `origUrl` parameter renamed to `url`
-* [#23061](https://github.com/qbittorrent/qBittorrent/pull/23061)
-  * `sync/torrentPeers` returns one new field: `i2p_dest`, only when the peer is from I2P
-    * In this case, the fields `ip` and `port` are not returned
-* [#23085](https://github.com/qbittorrent/qBittorrent/pull/23085)
-  * `torrents/parseMetadata` now responds with an array of metadata in the same order as the files in the request. It previously responded with an object keyed off of the submitted file name.
-
-## 2.12.1
-* [#23031](https://github.com/qbittorrent/qBittorrent/pull/23031)
-  * Add `torrents/setComment` endpoint with parameters `hashes` and `comment` for setting a new torrent comment
-
-## 2.12.0
-
-* [#22989](https://github.com/qbittorrent/qBittorrent/pull/22989)
-  * `sync/maindata` returns one new field: `share_limit_action`
-  * `torrents/setShareLimits` now requires a new `shareLimitAction` param that sets a torrent's shareLimitAction property
-    * possible values `Default`, `Stop`, `Remove`, `RemoveWithContent` and `EnableSuperSeeding`
-
-## 2.11.10
-
-* [#22958](https://github.com/qbittorrent/qBittorrent/pull/22958)
-  * `torrents/categories` and `sync/maindata` now serialize categories' `downloadPath` to `null`, rather than `undefined`
-* [#22954](https://github.com/qbittorrent/qBittorrent/pull/22954)
-  * `torrents/reannounce` supports specifying individual trackers via `trackers` field
-
-## 2.11.9
-
-* [#21015](https://github.com/qbittorrent/qBittorrent/pull/21015)
-  * Add `torrents/fetchMetadata` endpoint for retrieving torrent metadata associated with a URL
-  * Add `torrents/parseMetadata` endpoint for retrieving torrent metadata associated with a .torrent file
-  * Add `torrents/saveMetadata` endpoint for saving retrieved torrent metadata to a .torrent file
-  * `torrents/add` allows adding a torrent with metadata previously retrieved via `torrents/fetchMetadata` or `torrents/parseMetadata`
-  * `torrents/add` allows specifying a torrent's file priorities
-* [#22698](https://github.com/qbittorrent/qBittorrent/pull/22698)
-  * `torrents/addTrackers` and `torrents/removeTrackers` now accept `hash=all` and adds/removes the tracker to/from *all* torrents
-    * For compatibility, `torrents/removeTrackers` still accepts `hash=*` internally we transform it into `all`
-  * Allow passing a pipe (`|`) separated list of hashes in `hash` for `torrents/addTrackers` and `torrents/removeTrackers`
-
-## 2.11.8
-
-* [#21349](https://github.com/qbittorrent/qBittorrent/pull/21349)
-  * Handle sending `204 No Content` status code when response contains no data
-    * Some endpoints still return `200 OK` to ensure smooth transition
-* [#22750](https://github.com/qbittorrent/qBittorrent/pull/22750)
-  * `torrents/info` allows an optional parameter `includeFiles` that defaults to `false`
-    * Each torrent will contain a new key `files` which will list all files similar to the `torrents/files` endpoint
-* [#22813](https://github.com/qbittorrent/qBittorrent/pull/22813)
-  * `app/getDirectoryContent` allows an optional parameter `withMetadata` to send file metadata
-    * Fields are `name`, `type`, `size`, `creation_date`, `last_access_date`, `last_modification_date`
-    * See PR for TypeScript types
-
-## 2.11.7
-
-* [#22166](https://github.com/qbittorrent/qBittorrent/pull/22166)
-  * `sync/maindata` returns 3 new torrent fields: `has_tracker_warning`, `has_tracker_error`, `has_other_announce_error`
-
-## 2.11.6
-
-* [#22460](https://github.com/qbittorrent/qBittorrent/pull/22460)
-  * `app/setPreferences` allows only one of `max_ratio_enabled`, `max_ratio` to be present
-  * `app/setPreferences` allows only one of `max_seeding_time_enabled`, `max_seeding_time` to be present
-  * `app/setPreferences` allows only one of `max_inactive_seeding_time_enabled`, `max_inactive_seeding_time` to be present

bootstrap.sh

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