From 2031f59203cb2c9b804819c69a5994afb33d2a84 Mon Sep 17 00:00:00 2001 From: zsien Date: Fri, 21 Apr 2023 16:08:20 +0800 Subject: [PATCH] chore: don't initialize the default applications Moved to linuxdeepin/default-settings#30 --- src/modules/mimeapp/mime_app.cpp | 51 -------------------------------- src/modules/mimeapp/mime_app.h | 1 - 2 files changed, 52 deletions(-) diff --git a/src/modules/mimeapp/mime_app.cpp b/src/modules/mimeapp/mime_app.cpp index 6c165d6..e0470b0 100644 --- a/src/modules/mimeapp/mime_app.cpp +++ b/src/modules/mimeapp/mime_app.cpp @@ -162,7 +162,6 @@ MimeApp::MimeApp(QObject *parent) : QObject(parent), dd_ptr(new MimeAppPrivate(t { Q_D(MimeApp); d->Init(); - initConfigData(); } MimeApp::~MimeApp() @@ -199,56 +198,6 @@ void MimeApp::deleteMimeAssociation(std::string mimeType, std::string desktopId) keyFile.saveToFile(d->filename); } -void MimeApp::initConfigData() -{ - // TODO 这个配置文件当前仍然是在dde-daemon中,但mime的服务已经迁移到此项目,后续应该把这个配置文件拿过来 - std::string filename = findFilePath("/dde-daemon/mime/data.json"); - - QFile file(filename.c_str()); - if (!file.exists()) { - return; - } - - if (!file.open(QIODevice::ReadOnly)) { - return; - } - - QJsonParseError *error = new QJsonParseError; - QJsonDocument jdc = QJsonDocument::fromJson(file.readAll(), error); - - Methods::DefaultUserAppInfos defaultAppInfos; - Methods::fromJson(jdc.object(), defaultAppInfos); - - file.close(); - - for (auto defaultApp : defaultAppInfos.appInfos) { - std::string validAppId; - - for (auto type : defaultApp.supportedType) { - // 如果之前用户有修改默认程序,在每次初始化时不应该再使用配置文件里面的默认程序 - std::string appId = AppInfoManger::getDefaultApp(type.toString().toStdString(), false); - if (!appId.empty()) { - continue; - } - - if (!validAppId.empty()) { - if (setDefaultApp(type.toString().toStdString(), validAppId)) { - continue; - } - } - - for (auto appId : defaultApp.appId) { - if (setDefaultApp(type.toString().toStdString(), appId.toString().toStdString())) { - validAppId = appId.toString().toStdString(); - break; - } else { - continue; - } - } - } - } -} - std::string MimeApp::findFilePath(std::string fileName) { std::string homeDir = getUserHomeDir(); diff --git a/src/modules/mimeapp/mime_app.h b/src/modules/mimeapp/mime_app.h index 8ae71e9..cab39a0 100644 --- a/src/modules/mimeapp/mime_app.h +++ b/src/modules/mimeapp/mime_app.h @@ -19,7 +19,6 @@ class MimeApp : public QObject public: explicit MimeApp(QObject *parent = nullptr); void deleteMimeAssociation(std::string mimeType, std::string desktopId); - void initConfigData(); bool setDefaultApp(const std::string &mimeType, const std::string &desktopId); std::string findFilePath(std::string fileName); ~MimeApp() override;