Merge branch 'qbittorrent:master' into allow-multiple-connections-per-pid

Author: lzhzh1

src/app/application.cpp

@@ -477,13 +477,13 @@ void Application::setFileLoggerEnabled(const bool value)
 
 Path Application::fileLoggerPath() const
 {
-    return m_storeFileLoggerPath.get(specialFolderLocation(SpecialFolder::Data) / Path(LOG_FOLDER));
+    return m_storeFileLoggerPath.get(Path(LOG_FOLDER));
 }
 
 void Application::setFileLoggerPath(const Path &path)
 {
     if (m_fileLogger)
-        m_fileLogger->changePath(path);
+        m_fileLogger->setPath(path);
     m_storeFileLoggerPath = path;
 }
 
@@ -983,10 +983,10 @@ int Application::exec()
                 m_desktopIntegration->showNotification(tr("Torrent added"), tr("'%1' was added.", "e.g: xxx.avi was added.").arg(torrent->name()));
         });
         connect(m_addTorrentManager, &AddTorrentManager::addTorrentFailed, this
-                , [this](const QString &source, const BitTorrent::AddTorrentError &reason)
+                , [this](const QString &source, const QString &reason)
         {
             m_desktopIntegration->showNotification(tr("Add torrent failed")
-                    , tr("Couldn't add torrent '%1', reason: %2.").arg(source, reason.message));
+                    , tr("Couldn't add torrent '%1', reason: %2.").arg(source, reason));
         });
 
         disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);

src/app/filelogger.cpp

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2026  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2016  sledgehammer999 <hammered999@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -37,24 +38,23 @@
 
 #include "base/global.h"
 #include "base/logger.h"
+#include "base/profile.h"
 #include "base/utils/fs.h"
 
-namespace
-{
-    const std::chrono::seconds FLUSH_INTERVAL {2};
-}
+const QString LOG_FILENAME = u"qbittorrent.log"_s;
+const std::chrono::seconds FLUSH_INTERVAL {2};
 
 FileLogger::FileLogger(const Path &path, const bool backup
-                       , const int maxSize, const bool deleteOld, const int age
-                       , const FileLogAgeType ageType)
-    : m_backup(backup)
-    , m_maxSize(maxSize)
+        , const int maxSize, const bool deleteOld, const int age
+        , const FileLogAgeType ageType)
+    : m_backup {backup}
+    , m_maxSize {maxSize}
 {
     m_flusher.setInterval(FLUSH_INTERVAL);
     m_flusher.setSingleShot(true);
     connect(&m_flusher, &QTimer::timeout, this, &FileLogger::flushLog);
 
-    changePath(path);
+    setPath(path);
     if (deleteOld)
         this->deleteOld(age, ageType);
 
@@ -70,26 +70,27 @@ FileLogger::~FileLogger()
     closeLogFile();
 }
 
-void FileLogger::changePath(const Path &newPath)
+void FileLogger::setPath(const Path &newPath)
 {
+    const Path newPathAbs = newPath.isAbsolute() ? newPath : (specialFolderLocation(SpecialFolder::Data) / newPath);
     // compare paths as strings to perform case sensitive comparison on all the platforms
-    if (newPath.data() == m_path.parentPath().data())
+    if (newPathAbs.data() == m_logsFolderPath.data())
         return;
 
     closeLogFile();
 
-    m_path = newPath / Path(u"qbittorrent.log"_s);
-    m_logFile.setFileName(m_path.data());
+    m_logsFolderPath = newPathAbs;
+    m_logFile.setFileName((m_logsFolderPath / Path(LOG_FILENAME)).data());
 
-    Utils::Fs::mkpath(newPath);
+    Utils::Fs::mkpath(m_logsFolderPath);
     openLogFile();
 }
 
 void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
 {
     const QDateTime date = QDateTime::currentDateTime();
-    const QDir dir {m_path.parentPath().data()};
-    const QFileInfoList fileList = dir.entryInfoList(QStringList(u"qbittorrent.log.bak*"_s)
+    const QDir dir {m_logsFolderPath.data()};
+    const QFileInfoList fileList = dir.entryInfoList(QStringList(LOG_FILENAME + u".bak*")
         , (QDir::Files | QDir::Writable), (QDir::Time | QDir::Reversed));
 
     for (const QFileInfo &file : fileList)
@@ -149,15 +150,16 @@ void FileLogger::addLogMessage(const Log::Msg &msg)
     {
         closeLogFile();
         int counter = 0;
-        Path backupLogFilename = m_path + u".bak";
+        const Path logFilename = m_logsFolderPath / Path(LOG_FILENAME);
+        Path backupLogFilename = logFilename + u".bak";
 
         while (backupLogFilename.exists())
         {
             ++counter;
-            backupLogFilename = m_path + u".bak" + QString::number(counter);
+            backupLogFilename = logFilename + u".bak" + QString::number(counter);
         }
 
-        Utils::Fs::renameFile(m_path, backupLogFilename);
+        Utils::Fs::renameFile(logFilename, backupLogFilename);
         openLogFile();
     }
     else

src/app/filelogger.h

@@ -1,5 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
+ * Copyright (C) 2026  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2016  sledgehammer999 <hammered999@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
@@ -39,7 +40,7 @@ namespace Log
     struct Msg;
 }
 
-class FileLogger : public QObject
+class FileLogger final : public QObject
 {
     Q_OBJECT
     Q_DISABLE_COPY_MOVE(FileLogger)
@@ -53,9 +54,9 @@ class FileLogger : public QObject
     };
 
     FileLogger(const Path &path, bool backup, int maxSize, bool deleteOld, int age, FileLogAgeType ageType);
-    ~FileLogger();
+    ~FileLogger() override;
 
-    void changePath(const Path &newPath);
+    void setPath(const Path &newPath);
     void deleteOld(int age, FileLogAgeType ageType);
     void setBackup(bool value);
     void setMaxSize(int value);
@@ -68,7 +69,7 @@ private slots:
     void openLogFile();
     void closeLogFile();
 
-    Path m_path;
+    Path m_logsFolderPath;
     bool m_backup;
     int m_maxSize;
     QFile m_logFile;

src/base/CMakeLists.txt

@@ -5,7 +5,6 @@ add_library(qbt_base STATIC
     algorithm.h
     applicationcomponent.h
     asyncfilestorage.h
-    bittorrent/addtorrenterror.h
     bittorrent/addtorrentparams.h
     bittorrent/announcetimepoint.h
     bittorrent/bandwidthscheduler.h

src/base/addtorrentmanager.cpp

@@ -29,7 +29,6 @@
 
 #include "addtorrentmanager.h"
 
-#include "base/bittorrent/addtorrenterror.h"
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/session.h"
 #include "base/bittorrent/torrentdescriptor.h"
@@ -43,6 +42,7 @@ AddTorrentManager::AddTorrentManager(IApplication *app, BitTorrent::Session *btS
 {
     Q_ASSERT(btSession);
     connect(btSession, &BitTorrent::Session::torrentAdded, this, &AddTorrentManager::onSessionTorrentAdded);
+    connect(btSession, &BitTorrent::Session::duplicateTorrentDetected, this, &AddTorrentManager::onSessionDuplicateTorrentDetected);
     connect(btSession, &BitTorrent::Session::addTorrentFailed, this, &AddTorrentManager::onSessionAddTorrentFailed);
 }
 
@@ -141,7 +141,20 @@ void AddTorrentManager::onSessionTorrentAdded(BitTorrent::Torrent *torrent)
     }
 }
 
-void AddTorrentManager::onSessionAddTorrentFailed(const BitTorrent::InfoHash &infoHash, const BitTorrent::AddTorrentError &reason)
+void AddTorrentManager::onSessionDuplicateTorrentDetected(const BitTorrent::InfoHash &infoHash
+        , BitTorrent::Torrent *torrent, const QString &message)
+{
+    const QString source = m_sourcesByInfoHash.take(infoHash);
+    if (source.isEmpty())
+        return;
+
+    std::shared_ptr<TorrentFileGuard> torrentFileGuard = m_guardedTorrentFiles.take(source);
+    if (torrentFileGuard)
+        torrentFileGuard->setAutoRemove(false);
+    emit duplicateTorrentDetected(source, torrent, message);
+}
+
+void AddTorrentManager::onSessionAddTorrentFailed(const BitTorrent::InfoHash &infoHash, const QString &reason)
 {
     if (const QString source = m_sourcesByInfoHash.take(infoHash); !source.isEmpty())
     {
@@ -155,7 +168,7 @@ void AddTorrentManager::onSessionAddTorrentFailed(const BitTorrent::InfoHash &in
 void AddTorrentManager::handleAddTorrentFailed(const QString &source, const QString &reason)
 {
     LogMsg(tr("Failed to add torrent. Source: \"%1\". Reason: \"%2\"").arg(source, reason), Log::WARNING);
-    emit addTorrentFailed(source, {BitTorrent::AddTorrentError::Other, reason});
+    emit addTorrentFailed(source, reason);
 }
 
 void AddTorrentManager::handleDuplicateTorrent(const QString &source
@@ -188,7 +201,7 @@ void AddTorrentManager::handleDuplicateTorrent(const QString &source
 
     LogMsg(tr("Detected an attempt to add a duplicate torrent. Source: %1. Existing torrent: \"%2\". Torrent infohash: %3. Result: %4")
             .arg(source, existingTorrent->name(), existingTorrent->infoHash().toString(), message));
-    emit addTorrentFailed(source, {BitTorrent::AddTorrentError::DuplicateTorrent, message});
+    emit duplicateTorrentDetected(source, existingTorrent, message);
 }
 
 void AddTorrentManager::setTorrentFileGuard(const QString &source, std::shared_ptr<TorrentFileGuard> torrentFileGuard)

src/base/addtorrentmanager.h

@@ -44,7 +44,6 @@ namespace BitTorrent
     class Session;
     class Torrent;
     class TorrentDescriptor;
-    struct AddTorrentError;
 }
 
 namespace Net
@@ -67,7 +66,8 @@ class AddTorrentManager : public ApplicationComponent<QObject>
 
 signals:
     void torrentAdded(const QString &source, BitTorrent::Torrent *torrent);
-    void addTorrentFailed(const QString &source, const BitTorrent::AddTorrentError &reason);
+    void duplicateTorrentDetected(const QString &source, BitTorrent::Torrent *torrent, const QString &message);
+    void addTorrentFailed(const QString &source, const QString &reason);
 
 protected:
     bool addTorrentToSession(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr
@@ -80,7 +80,8 @@ class AddTorrentManager : public ApplicationComponent<QObject>
 private:
     void onDownloadFinished(const Net::DownloadResult &result);
     void onSessionTorrentAdded(BitTorrent::Torrent *torrent);
-    void onSessionAddTorrentFailed(const BitTorrent::InfoHash &infoHash, const BitTorrent::AddTorrentError &reason);
+    void onSessionDuplicateTorrentDetected(const BitTorrent::InfoHash &infoHash, BitTorrent::Torrent *torrent, const QString &message);
+    void onSessionAddTorrentFailed(const BitTorrent::InfoHash &infoHash, const QString &reason);
     bool processTorrent(const QString &source, const BitTorrent::TorrentDescriptor &torrentDescr
             , const BitTorrent::AddTorrentParams &addTorrentParams);
 

src/base/bittorrent/addtorrenterror.h

@@ -36,7 +36,6 @@
 
 #include "base/pathfwd.h"
 #include "base/tagset.h"
-#include "addtorrenterror.h"
 #include "addtorrentparams.h"
 #include "categoryoptions.h"
 #include "sharelimits.h"
@@ -488,7 +487,7 @@ namespace BitTorrent
 
     signals:
         void startupProgressUpdated(int progress);
-        void addTorrentFailed(const InfoHash &infoHash, const AddTorrentError &reason);
+        void addTorrentFailed(const InfoHash &infoHash, const QString &reason);
         void allTorrentsFinished();
         void categoryAdded(const QString &categoryName);
         void categoryRemoved(const QString &categoryName);
@@ -509,6 +508,7 @@ namespace BitTorrent
 
         void torrentAboutToBeRemoved(Torrent *torrent);
         void torrentAdded(Torrent *torrent);
+        void duplicateTorrentDetected(const InfoHash &infoHash, Torrent *torrent, const QString &message);
         void torrentCategoryChanged(Torrent *torrent, const QString &oldCategory);
         void torrentFinished(Torrent *torrent);
         void torrentFinishedChecking(Torrent *torrent);

src/base/bittorrent/session.h

@@ -2787,7 +2787,7 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
             const QString message = tr("Merging of trackers is disabled");
             LogMsg(tr("Detected an attempt to add a duplicate torrent. Existing torrent: \"%1\". Torrent infohash: %2. Result: %3")
                     .arg(torrent->name(), torrent->infoHash().toString(), message));
-            emit addTorrentFailed(infoHash, {AddTorrentError::DuplicateTorrent, message});
+            emit duplicateTorrentDetected(infoHash, torrent, message);
             return false;
         }
 
@@ -2797,7 +2797,7 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
             const QString message = tr("Trackers cannot be merged because it is a private torrent");
             LogMsg(tr("Detected an attempt to add a duplicate torrent. Existing torrent: \"%1\". Torrent infohash: %2. Result: %3")
                     .arg(torrent->name(), torrent->infoHash().toString(), message));
-            emit addTorrentFailed(infoHash, {AddTorrentError::DuplicateTorrent, message});
+            emit duplicateTorrentDetected(infoHash, torrent, message);
             return false;
         }
 
@@ -2808,7 +2808,7 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
         const QString message = tr("Trackers are merged from new source");
         LogMsg(tr("Detected an attempt to add a duplicate torrent. Existing torrent: \"%1\". Torrent infohash: %2. Result: %3")
                 .arg(torrent->name(), torrent->infoHash().toString(), message));
-        emit addTorrentFailed(infoHash, {AddTorrentError::DuplicateTorrent, message});
+        emit duplicateTorrentDetected(infoHash, torrent, message);
         return false;
     }
 
@@ -3016,12 +3016,18 @@ bool SessionImpl::addTorrent_impl(const TorrentDescriptor &source, const AddTorr
             if (alert->error)
             {
                 const QString msg = QString::fromStdString(alert->message());
-                LogMsg(tr("Failed to add torrent. Reason: \"%1\"").arg(msg), Log::WARNING);
-
                 const InfoHash infoHash = getInfoHash(alert->params);
-                const AddTorrentError::Kind errorKind = (alert->error == lt::errors::duplicate_torrent)
-                        ? AddTorrentError::DuplicateTorrent : AddTorrentError::Other;
-                emit addTorrentFailed(infoHash, {errorKind, msg});
+                if (Torrent *torrent = findTorrent(infoHash); (alert->error == lt::errors::duplicate_torrent) && torrent)
+                {
+                    LogMsg(tr("Detected an attempt to add a duplicate torrent. Existing torrent: \"%1\". Torrent infohash: %2. Result: %3")
+                            .arg(torrent->name(), torrent->infoHash().toString(), msg));
+                    emit duplicateTorrentDetected(infoHash, torrent, msg);
+                }
+                else
+                {
+                    LogMsg(tr("Failed to add torrent. Reason: \"%1\"").arg(msg), Log::WARNING);
+                    emit addTorrentFailed(infoHash, msg);
+                }
             }
             else
             {