Changed networkAccessManager to a shared pointer
This commit is contained in:
+2
-1
@@ -24,7 +24,8 @@ find_package(Qt6 6.8 REQUIRED COMPONENTS Core Gui Widgets Qml Quick QuickControl
|
|||||||
qt_standard_project_setup()
|
qt_standard_project_setup()
|
||||||
|
|
||||||
qt_add_executable(${CMAKE_PROJECT_NAME}
|
qt_add_executable(${CMAKE_PROJECT_NAME}
|
||||||
README.md)
|
README.md
|
||||||
|
LICENSE)
|
||||||
qt_add_resources(${CMAKE_PROJECT_NAME} "configuration"
|
qt_add_resources(${CMAKE_PROJECT_NAME} "configuration"
|
||||||
PREFIX "/"
|
PREFIX "/"
|
||||||
FILES
|
FILES
|
||||||
|
|||||||
@@ -19,15 +19,15 @@ qt_add_qml_module(
|
|||||||
newestpacksmodel.cpp
|
newestpacksmodel.cpp
|
||||||
common/komplex_global.h
|
common/komplex_global.h
|
||||||
common/slidingcachecontroller.h
|
common/slidingcachecontroller.h
|
||||||
common/slidingcachecontroller.cpp
|
|
||||||
common/paginator.h
|
common/paginator.h
|
||||||
common/paginator.cpp
|
|
||||||
common/coreservices.h
|
common/coreservices.h
|
||||||
common/coreservices.cpp
|
common/coreservices.cpp
|
||||||
common/logging.h
|
common/logging.h
|
||||||
common/fetchresult.h
|
common/fetchresult.h
|
||||||
paginators/newestpackspaginator.h
|
paginators/newestpackspaginator.h
|
||||||
paginators/newestpackspaginator.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(
|
target_compile_definitions(
|
||||||
|
|||||||
@@ -1,18 +1,52 @@
|
|||||||
#include "coreservices.h"
|
#include "coreservices.h"
|
||||||
#include "logging.h"
|
#include "logging.h"
|
||||||
|
|
||||||
QNetworkAccessManager *CoreServices::m_networkAccessManager = new QNetworkAccessManager();
|
QNetworkAccessManager *CoreServices::s_networkAccessManager = new QNetworkAccessManager();
|
||||||
|
QMutex CoreServices::s_networkAccessMutex;
|
||||||
|
QSharedPointer<QNetworkAccessManager> CoreServices::s_networkAccessPointer;
|
||||||
|
|
||||||
auto CoreServices::networkAccessManager() -> QNetworkAccessManager *
|
auto CoreServices::networkAccessManager() -> QWeakPointer<QNetworkAccessManager>
|
||||||
{
|
{
|
||||||
return m_networkAccessManager;
|
QMutexLocker locker(&s_networkAccessMutex);
|
||||||
|
|
||||||
|
if(!s_networkAccessPointer)
|
||||||
|
{
|
||||||
|
s_networkAccessManager = new QNetworkAccessManager;
|
||||||
|
|
||||||
|
QObject::connect(
|
||||||
|
s_networkAccessManager,
|
||||||
|
&QNetworkAccessManager::sslErrors,
|
||||||
|
s_networkAccessManager,
|
||||||
|
[] (QNetworkReply *reply, const QList<QSslError> &errors)
|
||||||
|
{
|
||||||
|
for(const auto &error : errors)
|
||||||
|
{
|
||||||
|
LOG_ERROR(
|
||||||
|
"CoreServices::networkAccessManager",
|
||||||
|
error.errorString().toStdString().c_str()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef KOMPLEX_LOCAL_DEV
|
||||||
|
reply->ignoreSslErrors();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
s_networkAccessPointer = QSharedPointer<QNetworkAccessManager>(
|
||||||
|
s_networkAccessManager,
|
||||||
|
&QNetworkAccessManager::deleteLater
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return s_networkAccessPointer.toWeakRef();
|
||||||
}
|
}
|
||||||
|
|
||||||
auto CoreServices::sessionToken() -> QByteArray
|
auto CoreServices::sessionToken() -> QByteArray
|
||||||
{
|
{
|
||||||
LOG_ERROR_X(true,
|
LOG_ERROR_X(true,
|
||||||
"CoreServices::sessionToken",
|
"CoreServices::sessionToken",
|
||||||
"User services not yet implements",
|
"User services not yet implemented",
|
||||||
{}
|
{}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Komplex Wallpaper Engine
|
||||||
|
* Copyright (C) 2026 @DigitalArtifex
|
||||||
|
* https://digitalartifex.dev - https://github.com/DigitalArtifex
|
||||||
|
*
|
||||||
|
* 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 3 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, see <https://www.gnu.org/licenses/>
|
||||||
|
*/
|
||||||
#ifndef CORESERVICES_H
|
#ifndef CORESERVICES_H
|
||||||
#define CORESERVICES_H
|
#define CORESERVICES_H
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QNetworkAccessManager>
|
#include <QNetworkAccessManager>
|
||||||
|
#include <QNetworkReply>
|
||||||
|
#include <QSharedPointer>
|
||||||
|
#include <QWeakPointer>
|
||||||
|
#include <QMutex>
|
||||||
|
#include <QMutexLocker>
|
||||||
|
|
||||||
class CoreServices
|
class CoreServices
|
||||||
{
|
{
|
||||||
@@ -13,7 +36,7 @@ public:
|
|||||||
* Plugin-wide QNetworkAccessManager
|
* Plugin-wide QNetworkAccessManager
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
static auto networkAccessManager() -> QNetworkAccessManager*;
|
static auto networkAccessManager() -> QWeakPointer<QNetworkAccessManager>;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief getSessionToken
|
* @brief getSessionToken
|
||||||
@@ -23,6 +46,14 @@ public:
|
|||||||
static auto sessionToken() -> QByteArray;
|
static auto sessionToken() -> QByteArray;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static QNetworkAccessManager *m_networkAccessManager;
|
|
||||||
|
CoreServices() = default;
|
||||||
|
~CoreServices() = default;
|
||||||
|
CoreServices(const CoreServices&) = delete;
|
||||||
|
CoreServices& operator=(const CoreServices&) = delete;
|
||||||
|
|
||||||
|
static QMutex s_networkAccessMutex;
|
||||||
|
static QNetworkAccessManager *s_networkAccessManager;
|
||||||
|
static QSharedPointer<QNetworkAccessManager> s_networkAccessPointer;
|
||||||
};
|
};
|
||||||
#endif // CORESERVICES_H
|
#endif // CORESERVICES_H
|
||||||
|
|||||||
Reference in New Issue
Block a user