Merge pull request #5987 from Chocobo1/temp_dir

Put temp files in .qBittorrent directory

src/app/application.cpp

@@ -629,6 +629,7 @@ void Application::cleanup()
     delete m_fileLogger;
     Logger::freeInstance();
     IconProvider::freeInstance();
+    Utils::Fs::removeDirRecursive(Utils::Fs::tempPath());
 
 #ifndef DISABLE_GUI
 #ifdef Q_OS_WIN

src/base/http/requestparser.cpp

@@ -35,7 +35,6 @@
 #include <QUrlQuery>
 #endif
 #include <QDir>
-#include <QTemporaryFile>
 #include <QDebug>
 #include "requestparser.h"
 

src/base/net/downloadhandler.cpp

@@ -142,7 +142,7 @@ void DownloadHandler::init()
 
 bool DownloadHandler::saveToFile(const QByteArray &replyData, QString &filePath)
 {
-    QTemporaryFile *tmpfile = new QTemporaryFile;
+    QTemporaryFile *tmpfile = new QTemporaryFile(Utils::Fs::tempPath() + "XXXXXX");
     if (!tmpfile->open()) {
         delete tmpfile;
         return false;

src/base/utils/fs.cpp

@@ -491,3 +491,10 @@ QString Utils::Fs::cacheLocation()
         locationDir.mkpath(locationDir.absolutePath());
     return location;
 }
+
+QString Utils::Fs::tempPath()
+{
+    static const QString path = QDir::tempPath() + "/.qBittorrent/";
+    QDir().mkdir(path);
+    return path;
+}

src/base/utils/fs.h

@@ -67,6 +67,7 @@ namespace Utils
         /* End of Qt4 code */
 
         QString cacheLocation();
+        QString tempPath();
     }
 }
 

src/gui/search/pluginselectdlg.cpp

@@ -34,7 +34,6 @@
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QDropEvent>
-#include <QTemporaryFile>
 #include <QMimeData>
 #include <QClipboard>
 #ifdef QBT_USES_QT5

src/gui/search/searchwidget.cpp

@@ -31,7 +31,6 @@
 
 #include <QHeaderView>
 #include <QMessageBox>
-#include <QTemporaryFile>
 #include <QSystemTrayIcon>
 #include <QTimer>
 #include <QDir>

src/webui/abstractwebapplication.cpp

@@ -36,6 +36,7 @@
 #include <QTimer>
 
 #include "base/preferences.h"
+#include "base/utils/fs.h"
 #include "websessiondata.h"
 #include "abstractwebapplication.h"
 
@@ -382,7 +383,7 @@ bool AbstractWebApplication::sessionEnd()
 
 QString AbstractWebApplication::saveTmpFile(const QByteArray &data)
 {
-    QTemporaryFile tmpfile(QDir::temp().absoluteFilePath("qBT-XXXXXX.torrent"));
+    QTemporaryFile tmpfile(Utils::Fs::tempPath() + "XXXXXX.torrent");
     tmpfile.setAutoRemove(false);
     if (tmpfile.open()) {
         tmpfile.write(data);