blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 使用QJson替换nlohmann

Browse Source 
使用qt自带json库,替换掉nlohmann库

Log:
Task: https://pms.uniontech.com/task-view-111975.html
Influence: json解析
Change-Id: Ifef186afc84f7ebd92f9f1591df4b96eba0774c7
This commit is contained in:
Li Xi
2022-04-24 14:52:13 +08:00
parent 0b22bb3adf
commit dd7d4737bf
17 changed files with 1072 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/service/CMakeLists.txt
View File

@ -2,8 +2,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
find_package(Qt5 REQUIRED COMPONENTS Core DBus Concurrent)
qt5_add_dbus_adaptor(ADAPTER_SOURCES
../../DBus/org.desktopspec.ApplicationManager.xml
impl/application_manager.h

10
src/service/impl/application_instance.cpp
View File

@ -140,15 +140,15 @@ Methods::Task ApplicationInstance::taskInfo() const
Q_D(const ApplicationInstance);
Methods::Task task;
task.id = d->m_id.toStdString();
task.runId = d->application->id().toStdString();
task.date = QString::number(startuptime()).toStdString();
task.id = d->m_id;
task.runId = d->application->id();
task.date = QString::number(startuptime());
// TODO: debug to display environment
task.environments.insert({ "DISPLAY", ":0" });
task.environments.insert( "DISPLAY", ":0" );
auto sysEnv = QProcessEnvironment::systemEnvironment();
for (const auto& key : sysEnv.keys()) {
task.environments.insert({ key.toStdString(), sysEnv.value(key).toStdString() });
task.environments.insert( key, sysEnv.value(key) );
}
return task;

54
src/service/impl/application_manager.cpp
View File

@ -5,7 +5,6 @@
#include <iostream>
#include <map>
#include <mutex>
#include <nlohmann/json.hpp>
#include <thread>
#include "../../modules/methods/basic.h"
@ -18,19 +17,20 @@
#include "application_instance.h"
#include "applicationinstanceadaptor.h"
class ApplicationManagerPrivate : public QObject {
class ApplicationManagerPrivate : public QObject
{
Q_OBJECT
ApplicationManager *q_ptr = nullptr;
Q_DECLARE_PUBLIC(ApplicationManager);
QList<QSharedPointer<Application>> applications;
Socket::Server server;
QList<QSharedPointer<Application>> applications;
Socket::Server server;
std::multimap<std::string, QSharedPointer<ApplicationInstance>> tasks;
public:
ApplicationManagerPrivate(ApplicationManager *parent) : QObject(parent), q_ptr(parent)
{
const QString socketPath{ QString("/run/user/%1/deepin-application-manager.socket").arg(getuid()) };
const QString socketPath{QString("/run/user/%1/deepin-application-manager.socket").arg(getuid())};
connect(&server, &Socket::Server::onReadyRead, this, &ApplicationManagerPrivate::recvClientData, Qt::QueuedConnection);
server.listen(socketPath.toStdString());
}
@ -43,43 +43,47 @@ private:
for (char c : data) {
tmp += c;
}
using namespace nlohmann;
if (json::parse(tmp).is_null()) {
server.close(socket);
return;
}
Methods::Basic basic = json::parse(tmp);
QByteArray jsonArray = data.data();
Methods::Basic basic;
Methods::fromJson(jsonArray, basic);
QByteArray tmpArray;
do {
if (basic.type == "instance") {
Methods::Instance instance = nlohmann::json::parse(tmp);
auto find = tasks.find(instance.hash);
if (find != tasks.end()) {
nlohmann::json result = find->second->taskInfo();
write(socket, result.dump());
Methods::Instance instance;
Methods::fromJson(jsonArray, instance);
auto find = tasks.find(instance.hash.toStdString());
if (find != tasks.end())
{
Methods::Task task = find->second->taskInfo();
Methods::toJson(tmpArray, task);
write(socket, tmpArray.toStdString());
tasks.erase(find);
break;
}
}
if (basic.type == "quit") {
Methods::Quit quit = json::parse(tmp);
Methods::Quit quit;
Methods::fromJson(jsonArray, quit);
server.close(socket);
std::cout << "client quit" << std::endl;
break;
}
if (basic.type == "registe") {
Methods::Registe registe = nlohmann::json::parse(tmp);
Methods::Registe registe;
Methods::fromJson(jsonArray, registe);
Methods::Registe result;
result.state = false;
//std::lock_guard<std::mutex> lock(task_mutex);
// std::lock_guard<std::mutex> lock(task_mutex);
for (auto it = tasks.begin(); it != tasks.end(); ++it) {
result.state = true;
result.hash = it->first;
result.hash = QString::fromStdString(it->first);
}
write(socket, json(result).dump());
std::cout << "registe a new client" << std::endl;
Methods::toJson(tmpArray, result);
write(socket, tmpArray.toStdString());
break;
}
write(socket, json().dump());
write(socket, jsonArray.toStdString());
} while (false);
}
@ -150,8 +154,8 @@ QDBusObjectPath ApplicationManager::Run(const QString &id)
for (const QSharedPointer<Application> &app : d->applications) {
if (app->id() == id) {
// 创建任务所需的数据，并记录到任务队列，等待 loader 消耗
QSharedPointer<ApplicationInstance> instance{ app->createInstance() };
const std::string hash{ instance->hash().toStdString() };
QSharedPointer<ApplicationInstance> instance{app->createInstance()};
const std::string hash{instance->hash().toStdString()};
connect(instance.get(), &ApplicationInstance::taskFinished, this, [=] {
for (auto it = d->tasks.begin(); it != d->tasks.end(); ++it) {
if (it->first == hash) {