mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-02-05 11:24:15 +00:00
Add migration code for WebUI https related change
This commit is contained in:
parent
5cdb3b6a2d
commit
52de31ac79
@ -7,6 +7,7 @@ application.cpp
|
|||||||
cmdoptions.cpp
|
cmdoptions.cpp
|
||||||
filelogger.cpp
|
filelogger.cpp
|
||||||
main.cpp
|
main.cpp
|
||||||
|
upgrade.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(qBittorrent PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
target_include_directories(qBittorrent PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
@ -17,13 +17,15 @@ usesystemqtsingleapplication {
|
|||||||
HEADERS += \
|
HEADERS += \
|
||||||
$$PWD/application.h \
|
$$PWD/application.h \
|
||||||
$$PWD/cmdoptions.h \
|
$$PWD/cmdoptions.h \
|
||||||
$$PWD/filelogger.h
|
$$PWD/filelogger.h \
|
||||||
|
$$PWD/upgrade.h
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
$$PWD/application.cpp \
|
$$PWD/application.cpp \
|
||||||
$$PWD/cmdoptions.cpp \
|
$$PWD/cmdoptions.cpp \
|
||||||
$$PWD/filelogger.cpp \
|
$$PWD/filelogger.cpp \
|
||||||
$$PWD/main.cpp
|
$$PWD/main.cpp \
|
||||||
|
$$PWD/upgrade.cpp
|
||||||
|
|
||||||
stacktrace {
|
stacktrace {
|
||||||
unix {
|
unix {
|
||||||
@ -37,6 +39,3 @@ stacktrace {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# upgrade code
|
|
||||||
HEADERS += $$PWD/upgrade.h
|
|
||||||
|
84
src/app/upgrade.cpp
Normal file
84
src/app/upgrade.cpp
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
/*
|
||||||
|
* Bittorrent Client using Qt and libtorrent.
|
||||||
|
* Copyright (C) 2019 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "upgrade.h"
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
|
#include "base/logger.h"
|
||||||
|
#include "base/profile.h"
|
||||||
|
#include "base/settingsstorage.h"
|
||||||
|
#include "base/utils/fs.h"
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
void exportWebUIHttpsFiles()
|
||||||
|
{
|
||||||
|
const auto migrate = [](const QString &oldKey, const QString &newKey, const QString &savePath) {
|
||||||
|
SettingsStorage *settingsStorage {SettingsStorage::instance()};
|
||||||
|
const QByteArray oldData {settingsStorage->loadValue(oldKey).toByteArray()};
|
||||||
|
const QString newData {settingsStorage->loadValue(newKey).toString()};
|
||||||
|
const QString errorMsgFormat {QObject::tr("Migrate preferences failed: WebUI https, file: \"%1\", error: \"%2\"")};
|
||||||
|
|
||||||
|
if (!newData.isEmpty() || oldData.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
QFile file(savePath);
|
||||||
|
if (!file.open(QIODevice::WriteOnly)) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
settingsStorage->storeValue(newKey, savePath);
|
||||||
|
settingsStorage->removeValue(oldKey);
|
||||||
|
|
||||||
|
LogMsg(QObject::tr("Migrated preferences: WebUI https, exported data to file: \"%1\"").arg(savePath)
|
||||||
|
, Log::INFO);
|
||||||
|
};
|
||||||
|
|
||||||
|
const QString configPath {specialFolderLocation(SpecialFolder::Config)};
|
||||||
|
migrate(QLatin1String("Preferences/WebUI/HTTPS/Certificate")
|
||||||
|
, QLatin1String("Preferences/WebUI/HTTPS/CertificatePath")
|
||||||
|
, Utils::Fs::toNativePath(configPath + QLatin1String("WebUICertificate.crt")));
|
||||||
|
migrate(QLatin1String("Preferences/WebUI/HTTPS/Key")
|
||||||
|
, QLatin1String("Preferences/WebUI/HTTPS/KeyPath")
|
||||||
|
, Utils::Fs::toNativePath(configPath + QLatin1String("WebUIPrivateKey.pem")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool upgrade(const bool /*ask*/)
|
||||||
|
{
|
||||||
|
exportWebUIHttpsFiles();
|
||||||
|
return true;
|
||||||
|
}
|
@ -28,9 +28,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
bool upgrade(bool /*ask*/ = true)
|
bool upgrade(bool ask = true);
|
||||||
{
|
|
||||||
// Intentionally left no-op as a placeholder for future use
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user