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

feat: add impl of updateApplicationInfo

Browse Source 
1. change the way to traverse files
2. refact some code

Signed-off-by: ComixHe <heyuming@deepin.org>
Signed-off-by: black-desk <me@black-desk.cn>
This commit is contained in:
ComixHe
2023-08-10 14:32:09 +08:00
committed by Comix
parent 799100436c
commit 722d0666d3
15 changed files with 307 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/dde-application-manager/src/main.cpp
View File

@ -8,7 +8,6 @@
#include <QDir>
#include "dbus/applicationmanager1service.h"
#include "cgroupsidentifier.h"
#include "global.h"
static void registerComplexDbusType()
{
@ -20,6 +19,7 @@ static void registerComplexDbusType()
int main(int argc, char *argv[])
{
QCoreApplication app{argc, argv};
auto &bus = ApplicationManager1DBus::instance();
bus.initGlobalServerBus(DBusType::Session);
bus.setDestBus("");
@ -32,30 +32,24 @@ int main(int argc, char *argv[])
XDGDataDirs = qgetenv("XDG_DATA_DIRS");
if (XDGDataDirs.isEmpty()) {
XDGDataDirs.append("/usr/local/share/:/usr/share/");
qputenv("XDG_DATA_DIRS", XDGDataDirs);
}
auto desktopFileDirs = XDGDataDirs.split(':');
auto desktopFileDirs = QString::fromLocal8Bit(XDGDataDirs).split(':', Qt::SkipEmptyParts);
for (const auto &dir : desktopFileDirs) {
auto dirPath = QDir{QDir::cleanPath(dir) + "/applications"};
if (!dirPath.exists()) {
continue;
std::for_each(desktopFileDirs.begin(), desktopFileDirs.end(), [](QString &str) {
str = QDir::cleanPath(str) + QDir::separator() + "applications";
});
applyIteratively(QList<QDir>(desktopFileDirs.begin(), desktopFileDirs.end()), [&AMService](const QFileInfo &info) -> bool {
ParseError err{ParseError::NoError};
auto ret = DesktopFile::searchDesktopFile(info.absoluteFilePath(), err);
if (!ret.has_value()) {
qWarning() << "failed to search File:" << err;
return false;
}
QDirIterator it{dirPath.absolutePath(),
{"*.desktop"},
QDir::Files | QDir::NoSymLinks | QDir::NoDotAndDotDot | QDir::Readable,
QDirIterator::Subdirectories};
while (it.hasNext()) {
auto file = it.next();
ParseError err;
auto ret = DesktopFile::searchDesktopFile(file, err);
if (!ret.has_value()) {
continue;
}
if (!AMService.addApplication(std::move(ret).value())) {
break;
}
}
}
AMService.addApplication(std::move(ret).value());
return false; // means to apply this function to the rest of the files
});
return app.exec();
}