From 857db2625a43d138d03722a93330dae51df57d2d Mon Sep 17 00:00:00 2001 From: black-desk Date: Fri, 21 Jul 2023 14:47:40 +0800 Subject: [PATCH] style: format code --- src/dbus/applicationmanager1service.cpp | 10 ++++- src/dbus/applicationmanager1service.h | 8 ++-- src/dbus/applicationservice.cpp | 50 +++++++++++++++++----- src/dbus/applicationservice.h | 10 ++--- src/dbus/instanceservice.cpp | 13 ++++-- src/dbus/instanceservice.h | 2 +- src/dbus/jobmanager1service.h | 12 ++++-- src/dbus/jobservice.cpp | 2 +- src/dbus/jobservice.h | 2 +- src/desktopentry.cpp | 56 ++++++++++++------------- src/include/desktopentry.h | 24 +++++------ src/include/global.h | 6 +-- tests/main.cpp | 2 +- tests/ut_desktopentry.cpp | 13 +++--- tests/ut_jobmanager.cpp | 16 ++++--- 15 files changed, 135 insertions(+), 91 deletions(-) diff --git a/src/dbus/applicationmanager1service.cpp b/src/dbus/applicationmanager1service.cpp index 97432fc..f9f95fd 100644 --- a/src/dbus/applicationmanager1service.cpp +++ b/src/dbus/applicationmanager1service.cpp @@ -9,14 +9,20 @@ ApplicationManager1Service::~ApplicationManager1Service() = default; ApplicationManager1Service::ApplicationManager1Service() = default; -QList ApplicationManager1Service::list() const { return m_applicationList.keys(); } +QList ApplicationManager1Service::list() const +{ + return m_applicationList.keys(); +} bool ApplicationManager1Service::removeOneApplication(const QDBusObjectPath &application) { return m_applicationList.remove(application) != 0; } -void ApplicationManager1Service::removeAllApplication() { m_applicationList.clear(); } +void ApplicationManager1Service::removeAllApplication() +{ + m_applicationList.clear(); +} QDBusObjectPath ApplicationManager1Service::Application(const QString &id) { diff --git a/src/dbus/applicationmanager1service.h b/src/dbus/applicationmanager1service.h index 1eaf3d2..c6b6b01 100644 --- a/src/dbus/applicationmanager1service.h +++ b/src/dbus/applicationmanager1service.h @@ -21,13 +21,11 @@ public: ApplicationManager1Service(const ApplicationManager1Service &) = delete; ApplicationManager1Service(ApplicationManager1Service &&) = delete; ApplicationManager1Service &operator=(const ApplicationManager1Service &) = delete; - ApplicationManager1Service &operator=(ApplicationManager1Service&&) = delete; + ApplicationManager1Service &operator=(ApplicationManager1Service &&) = delete; Q_PROPERTY(QList List READ list) QList list() const; - void addApplication(const QString &ID, - const QStringList &actions, - bool AutoStart = false); + void addApplication(const QString &ID, const QStringList &actions, bool AutoStart = false); bool removeOneApplication(const QDBusObjectPath &application); void removeAllApplication(); @@ -37,7 +35,7 @@ public Q_SLOTS: QDBusObjectPath Launch(const QString &id, const QString &action, const QStringList &fields, const QVariantMap &options); private: - QMap> m_applicationList; + QMap> m_applicationList; }; #endif diff --git a/src/dbus/applicationservice.cpp b/src/dbus/applicationservice.cpp index e95756c..0d46000 100644 --- a/src/dbus/applicationservice.cpp +++ b/src/dbus/applicationservice.cpp @@ -35,22 +35,52 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL return {}; } -QStringList ApplicationService::actions() const noexcept { return m_actions; } +QStringList ApplicationService::actions() const noexcept +{ + return m_actions; +} -QStringList& ApplicationService::actionsRef() noexcept { return m_actions; } +QStringList &ApplicationService::actionsRef() noexcept +{ + return m_actions; +} -QString ApplicationService::iD() const noexcept { return m_ID; } +QString ApplicationService::iD() const noexcept +{ + return m_ID; +} -IconMap ApplicationService::icons() const { return m_Icons; } +IconMap ApplicationService::icons() const +{ + return m_Icons; +} -IconMap& ApplicationService::iconsRef() { return m_Icons; } +IconMap &ApplicationService::iconsRef() +{ + return m_Icons; +} -bool ApplicationService::isAutoStart() const noexcept { return m_AutoStart; } +bool ApplicationService::isAutoStart() const noexcept +{ + return m_AutoStart; +} -void ApplicationService::setAutoStart(bool autostart) noexcept { m_AutoStart = autostart; } +void ApplicationService::setAutoStart(bool autostart) noexcept +{ + m_AutoStart = autostart; +} -QList ApplicationService::instances() const noexcept { return m_Instances.keys(); } +QList ApplicationService::instances() const noexcept +{ + return m_Instances.keys(); +} -bool ApplicationService::removeOneInstance(const QDBusObjectPath &instance) { return m_Instances.remove(instance) != 0; } +bool ApplicationService::removeOneInstance(const QDBusObjectPath &instance) +{ + return m_Instances.remove(instance) != 0; +} -void ApplicationService::removeAllInstance() { m_Instances.clear();} +void ApplicationService::removeAllInstance() +{ + m_Instances.clear(); +} diff --git a/src/dbus/applicationservice.h b/src/dbus/applicationservice.h index 581345c..4b4c5d3 100644 --- a/src/dbus/applicationservice.h +++ b/src/dbus/applicationservice.h @@ -19,21 +19,21 @@ class ApplicationService : public QObject Q_OBJECT public: ~ApplicationService() override; - ApplicationService(const ApplicationService&) = delete; + ApplicationService(const ApplicationService &) = delete; ApplicationService(ApplicationService &&) = delete; - ApplicationService& operator=(const ApplicationService&) = delete; + ApplicationService &operator=(const ApplicationService &) = delete; ApplicationService &operator=(ApplicationService &&) = delete; Q_PROPERTY(QStringList Actions READ actions CONSTANT) QStringList actions() const noexcept; - QStringList& actionsRef() noexcept; + QStringList &actionsRef() noexcept; Q_PROPERTY(QString ID READ iD CONSTANT) QString iD() const noexcept; Q_PROPERTY(IconMap Icons READ icons) IconMap icons() const; - IconMap& iconsRef(); + IconMap &iconsRef(); Q_PROPERTY(bool AutoStart READ isAutoStart WRITE setAutoStart) bool isAutoStart() const noexcept; @@ -57,7 +57,7 @@ private: QString m_ID; QDBusObjectPath m_applicationPath; QStringList m_actions; - QMap> m_Instances; + QMap> m_Instances; IconMap m_Icons; }; diff --git a/src/dbus/instanceservice.cpp b/src/dbus/instanceservice.cpp index 1bd49b0..77ede63 100644 --- a/src/dbus/instanceservice.cpp +++ b/src/dbus/instanceservice.cpp @@ -5,12 +5,19 @@ #include "instanceservice.h" InstanceService::InstanceService(QString application, QString systemdUnitPath) - : m_Application(std::move(application)), m_SystemdUnitPath(std::move(systemdUnitPath)) + : m_Application(std::move(application)) + , m_SystemdUnitPath(std::move(systemdUnitPath)) { } InstanceService::~InstanceService() = default; -QDBusObjectPath InstanceService::application() const { return m_Application; } +QDBusObjectPath InstanceService::application() const +{ + return m_Application; +} -QDBusObjectPath InstanceService::systemdUnitPath() const { return m_SystemdUnitPath; } +QDBusObjectPath InstanceService::systemdUnitPath() const +{ + return m_SystemdUnitPath; +} diff --git a/src/dbus/instanceservice.h b/src/dbus/instanceservice.h index 32549ed..8fd6f52 100644 --- a/src/dbus/instanceservice.h +++ b/src/dbus/instanceservice.h @@ -16,7 +16,7 @@ public: InstanceService(const InstanceService &) = delete; InstanceService(InstanceService &&) = delete; InstanceService &operator=(const InstanceService &) = delete; - InstanceService &operator=(InstanceService&&) = delete; + InstanceService &operator=(InstanceService &&) = delete; Q_PROPERTY(QDBusObjectPath Application READ application CONSTANT) QDBusObjectPath application() const; diff --git a/src/dbus/jobmanager1service.h b/src/dbus/jobmanager1service.h index 943e82e..85b2101 100644 --- a/src/dbus/jobmanager1service.h +++ b/src/dbus/jobmanager1service.h @@ -23,7 +23,7 @@ class JobManager1Service final : public QObject public: JobManager1Service(); JobManager1Service(const JobManager1Service &) = delete; - JobManager1Service(JobManager1Service&&) = delete; + JobManager1Service(JobManager1Service &&) = delete; JobManager1Service &operator=(const JobManager1Service &) = delete; JobManager1Service &operator=(JobManager1Service &&) = delete; @@ -34,8 +34,12 @@ public: static_assert(std::is_invocable_v, "param type must be QVariant."); QString objectPath{DDEApplicationManager1JobObjectPath + QUuid::createUuid().toString(QUuid::Id128)}; - auto future = QtConcurrent::mappedReduced( - args.begin(), args.end(), func,qOverload(&QVariantList::append), QVariantList{}, QtConcurrent::ReduceOption::OrderedReduce); + auto future = QtConcurrent::mappedReduced(args.begin(), + args.end(), + func, + qOverload(&QVariantList::append), + QVariantList{}, + QtConcurrent::ReduceOption::OrderedReduce); QSharedPointer job{new JobService{future}}; auto path = QDBusObjectPath{objectPath}; { @@ -44,7 +48,7 @@ public: } emit JobNew(path, source); registerObjectToDbus(new JobAdaptor(job.data()), objectPath, getDBusInterface()); - auto emitRemove = [this, job, path, future] (QVariantList value) { + auto emitRemove = [this, job, path, future](QVariantList value) { decltype(m_jobs)::size_type removeCount{0}; { QMutexLocker locker{&m_mutex}; diff --git a/src/dbus/jobservice.cpp b/src/dbus/jobservice.cpp index c234a21..839e062 100644 --- a/src/dbus/jobservice.cpp +++ b/src/dbus/jobservice.cpp @@ -4,7 +4,7 @@ #include "jobservice.h" -JobService::JobService(const QFuture& job) +JobService::JobService(const QFuture &job) : m_job(job) { } diff --git a/src/dbus/jobservice.h b/src/dbus/jobservice.h index 0fac737..1dd013a 100644 --- a/src/dbus/jobservice.h +++ b/src/dbus/jobservice.h @@ -29,7 +29,7 @@ public Q_SLOTS: private: friend class JobManager1Service; - explicit JobService(const QFuture& job); + explicit JobService(const QFuture &job); QFuture m_job; }; diff --git a/src/desktopentry.cpp b/src/desktopentry.cpp index d598b96..f758e1d 100644 --- a/src/desktopentry.cpp +++ b/src/desktopentry.cpp @@ -22,12 +22,12 @@ auto DesktopEntry::parserGroupHeader(const QString &str) noexcept } } -ParseError DesktopEntry::parseEntry(const QString &str, decltype(m_entryMap)::iterator& currentGroup) noexcept +ParseError DesktopEntry::parseEntry(const QString &str, decltype(m_entryMap)::iterator ¤tGroup) noexcept { if (str.startsWith("#")) return ParseError::NoError; auto splitCharIndex = str.indexOf(']'); - if(splitCharIndex != -1){ + if (splitCharIndex != -1) { for (; splitCharIndex < str.size(); ++splitCharIndex) { if (str.at(splitCharIndex) == '=') break; @@ -39,11 +39,11 @@ ParseError DesktopEntry::parseEntry(const QString &str, decltype(m_entryMap)::it auto valueStr = str.sliced(splitCharIndex + 1).trimmed(); QString key, valueKey{defaultKeyStr}; - constexpr auto MainKey = R"re((?[0-9a-zA-Z-]+))re";// main key. eg.(Name, X-CUSTOM-KEY). - constexpr auto Language = R"re((?:[a-z]+))re";// language of locale postfix. eg.(en, zh) - constexpr auto Country = R"re((?:_[A-Z]+))re";// country of locale postfix. eg.(US, CN) - constexpr auto Encoding = R"re((?:\.[0-9A-Z-]+))re";// encoding of locale postfix. eg.(UFT-8) - constexpr auto Modifier = R"re((?:@[a-z=;]+))re";// modifier of locale postfix. eg(euro;collation=traditional) + constexpr auto MainKey = R"re((?[0-9a-zA-Z-]+))re"; // main key. eg.(Name, X-CUSTOM-KEY). + constexpr auto Language = R"re((?:[a-z]+))re"; // language of locale postfix. eg.(en, zh) + constexpr auto Country = R"re((?:_[A-Z]+))re"; // country of locale postfix. eg.(US, CN) + constexpr auto Encoding = R"re((?:\.[0-9A-Z-]+))re"; // encoding of locale postfix. eg.(UFT-8) + constexpr auto Modifier = R"re((?:@[a-z=;]+))re"; // modifier of locale postfix. eg(euro;collation=traditional) const static auto validKey = QString("^%1(?:\\[(?%2%3?%4?%5?)\\])?$").arg(MainKey).arg(Language).arg(Country).arg(Encoding).arg(Modifier); // example: https://regex101.com/r/hylOay/1 @@ -58,7 +58,7 @@ ParseError DesktopEntry::parseEntry(const QString &str, decltype(m_entryMap)::it key = matcher.captured("MainKey"); if (auto locale = matcher.captured("LOCALE"); !locale.isEmpty()) { - valueKey = locale ; + valueKey = locale; } qDebug() << valueKey << valueStr; if (auto cur = currentGroup->find(key); cur == currentGroup->end()) { @@ -81,10 +81,10 @@ std::optional DesktopFile::searchDesktopFile(const QString &desktop { if (auto tmp = desktopFile.split("."); tmp.last() != "desktop") { qWarning() << "file isn't a desktop file"; - err = ParseError::MismatchedFile; + err = ParseError::MismatchedFile; return std::nullopt; } - QString path,id; + QString path, id; QFileInfo Fileinfo{desktopFile}; if (Fileinfo.isAbsolute() and Fileinfo.exists()) { path = desktopFile; @@ -93,8 +93,9 @@ std::optional DesktopFile::searchDesktopFile(const QString &desktop qDebug() << "Current Application Dirs:" << XDGDataDirs; for (const auto &d : XDGDataDirs) { auto dirPath = QDir::cleanPath(d); - QDirIterator it{dirPath,{desktopFile},QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot, QDirIterator::Subdirectories}; - if (it.hasNext()){ + QDirIterator it{ + dirPath, {desktopFile}, QDir::AllEntries | QDir::NoSymLinks | QDir::NoDotAndDotDot, QDirIterator::Subdirectories}; + if (it.hasNext()) { path = it.next(); break; } @@ -119,10 +120,10 @@ std::optional DesktopFile::searchDesktopFile(const QString &desktop id = FileId.chopped(1); } err = ParseError::NoError; - return DesktopFile{std::move(path),std::move(id)}; + return DesktopFile{std::move(path), std::move(id)}; } -ParseError DesktopEntry::parse(QTextStream& stream) noexcept +ParseError DesktopEntry::parse(QTextStream &stream) noexcept { if (stream.atEnd()) return ParseError::OpenFailed; @@ -143,7 +144,7 @@ ParseError DesktopEntry::parse(QTextStream& stream) noexcept if (auto e = parseEntry(line, currentGroup); e != ParseError::NoError) { err = e; - qWarning() << "an error occurred,this line will be skipped:"<< line; + qWarning() << "an error occurred,this line will be skipped:" << line; } } return err; @@ -209,15 +210,14 @@ QString DesktopEntry::Value::toString(bool &ok) const noexcept auto unescapedStr = unescape(*str); constexpr auto controlChars = "\\p{Cc}"; constexpr auto asciiChars = "[^\x00-\x7f]"; - if (unescapedStr.contains(QRegularExpression{controlChars}) and - unescapedStr.contains(QRegularExpression{asciiChars})) + if (unescapedStr.contains(QRegularExpression{controlChars}) and unescapedStr.contains(QRegularExpression{asciiChars})) return {}; ok = true; return unescapedStr; } -QString DesktopEntry::Value::toLocaleString(const QLocale &locale, bool& ok) const noexcept +QString DesktopEntry::Value::toLocaleString(const QLocale &locale, bool &ok) const noexcept { ok = false; for (auto it = this->constKeyValueBegin(); it != this->constKeyValueEnd(); ++it) { @@ -238,7 +238,7 @@ QString DesktopEntry::Value::toIconString(bool &ok) const noexcept bool DesktopEntry::Value::toBoolean(bool &ok) const noexcept { ok = false; - const auto& str = (*this)[defaultKeyStr]; + const auto &str = (*this)[defaultKeyStr]; if (str == "true") { ok = true; return true; @@ -252,7 +252,7 @@ bool DesktopEntry::Value::toBoolean(bool &ok) const noexcept float DesktopEntry::Value::toNumeric(bool &ok) const noexcept { - const auto& str = (*this)[defaultKeyStr]; + const auto &str = (*this)[defaultKeyStr]; QVariant v{str}; return v.toFloat(&ok); } @@ -260,7 +260,7 @@ float DesktopEntry::Value::toNumeric(bool &ok) const noexcept QDebug operator<<(QDebug debug, const DesktopEntry::Value &v) { QDebugStateSaver saver{debug}; - debug << static_cast&>(v); + debug << static_cast &>(v); return debug; } @@ -269,31 +269,31 @@ QDebug operator<<(QDebug debug, const ParseError &v) QDebugStateSaver saver{debug}; QString errMsg; switch (v) { - case ParseError::NoError:{ + case ParseError::NoError: { errMsg = "no error."; break; } - case ParseError::NotFound:{ + case ParseError::NotFound: { errMsg = "file not found."; break; } - case ParseError::MismatchedFile:{ + case ParseError::MismatchedFile: { errMsg = "file type is mismatched."; break; } - case ParseError::InvalidLocation:{ + case ParseError::InvalidLocation: { errMsg = "file location is invalid, please check $XDG_DATA_DIRS."; break; } - case ParseError::OpenFailed:{ + case ParseError::OpenFailed: { errMsg = "couldn't open the file."; break; } - case ParseError::GroupHeaderInvalid:{ + case ParseError::GroupHeaderInvalid: { errMsg = "groupHead syntax is invalid."; break; } - case ParseError::EntryKeyInvalid:{ + case ParseError::EntryKeyInvalid: { errMsg = "key syntax is invalid."; break; } diff --git a/src/include/desktopentry.h b/src/include/desktopentry.h index 7aef25f..011afcc 100644 --- a/src/include/desktopentry.h +++ b/src/include/desktopentry.h @@ -11,15 +11,7 @@ constexpr static auto defaultKeyStr = "default"; -enum class ParseError { - NoError, - NotFound, - MismatchedFile, - InvalidLocation, - OpenFailed, - GroupHeaderInvalid, - EntryKeyInvalid -}; +enum class ParseError { NoError, NotFound, MismatchedFile, InvalidLocation, OpenFailed, GroupHeaderInvalid, EntryKeyInvalid }; class DesktopEntry { @@ -41,7 +33,7 @@ public: DesktopEntry() = default; ~DesktopEntry() = default; - [[nodiscard]] ParseError parse(QTextStream& stream) noexcept; + [[nodiscard]] ParseError parse(QTextStream &stream) noexcept; [[nodiscard]] QMap group(const QString &key) const noexcept; private: @@ -61,15 +53,19 @@ struct DesktopFile const QString &filePath() const { return m_filePath; } const QString &desktopId() const { return m_desktopId; } - - static std::optional searchDesktopFile(const QString &desktopFilePath, ParseError& err) noexcept; + + static std::optional searchDesktopFile(const QString &desktopFilePath, ParseError &err) noexcept; private: - DesktopFile(QString &&path,QString &&fileId):m_filePath(std::move(path)),m_desktopId(std::move(fileId)){} + DesktopFile(QString &&path, QString &&fileId) + : m_filePath(std::move(path)) + , m_desktopId(std::move(fileId)) + { + } QString m_filePath; QString m_desktopId; }; -QDebug operator<<(QDebug debug, const DesktopEntry::Value& v); +QDebug operator<<(QDebug debug, const DesktopEntry::Value &v); QDebug operator<<(QDebug debug, const ParseError &v); diff --git a/src/include/global.h b/src/include/global.h index 5aa5214..41804bb 100644 --- a/src/include/global.h +++ b/src/include/global.h @@ -28,10 +28,10 @@ public: ApplicationManager1DBus(const ApplicationManager1DBus &) = delete; ApplicationManager1DBus(ApplicationManager1DBus &&) = delete; ApplicationManager1DBus &operator=(const ApplicationManager1DBus &) = delete; - ApplicationManager1DBus &operator=(ApplicationManager1DBus&&) = delete; + ApplicationManager1DBus &operator=(ApplicationManager1DBus &&) = delete; const QString &BusAddress() { return m_busAddress; } void setBusAddress(const QString &address) { m_busAddress = address; } - QDBusConnection& CustomBus() + QDBusConnection &CustomBus() { static auto con = QDBusConnection::connectToBus(m_busAddress, "org.deepin.dde.ApplicationManager1"); if (!con.isConnected()) { @@ -52,7 +52,7 @@ private: QString m_busAddress; }; -bool registerObjectToDbus(QObject* o, const QString &path, const QString &interface); +bool registerObjectToDbus(QObject *o, const QString &path, const QString &interface); template QString getDBusInterface() diff --git a/tests/main.cpp b/tests/main.cpp index 96a2e4d..44b8e27 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -19,4 +19,4 @@ int main(int argc, char **argv) __sanitizer_set_report_path("asan_am.log"); QCoreApplication::exec(); return ret; -} +} diff --git a/tests/ut_desktopentry.cpp b/tests/ut_desktopentry.cpp index a353bbe..b942f34 100644 --- a/tests/ut_desktopentry.cpp +++ b/tests/ut_desktopentry.cpp @@ -18,26 +18,24 @@ public: auto curDir = QDir::current(); QString path{curDir.absolutePath() + "/data/desktopExample.desktop"}; ParseError err; - auto file = DesktopFile::searchDesktopFile(path,err); + auto file = DesktopFile::searchDesktopFile(path, err); if (!file.has_value()) { qWarning() << "search " << path << "failed:" << err; return; } m_file.reset(new DesktopFile{std::move(file).value()}); } - void SetUp() override - { - - } + void SetUp() override {} void TearDown() override {} QSharedPointer file() { return m_file; } + private: static inline QSharedPointer m_file; }; TEST_F(TestDesktopEntry, desktopFile) { - const auto& fileptr = file(); + const auto &fileptr = file(); ASSERT_FALSE(fileptr.isNull()); const auto &exampleFile = file(); auto curDir = QDir::current(); @@ -49,7 +47,8 @@ TEST_F(TestDesktopEntry, desktopFile) TEST_F(TestDesktopEntry, prase) { const auto &exampleFile = file(); - ASSERT_FALSE(exampleFile.isNull());; + ASSERT_FALSE(exampleFile.isNull()); + ; DesktopEntry entry; QFile in{exampleFile->filePath()}; ASSERT_TRUE(in.open(QFile::ExistingOnly | QFile::ReadOnly | QFile::Text)); diff --git a/tests/ut_jobmanager.cpp b/tests/ut_jobmanager.cpp index ac793ef..47cc91c 100644 --- a/tests/ut_jobmanager.cpp +++ b/tests/ut_jobmanager.cpp @@ -9,7 +9,8 @@ class TestJobManager : public testing::Test { public: - JobManager1Service& service() { return m_jobManager; } + JobManager1Service &service() { return m_jobManager; } + private: JobManager1Service m_jobManager; }; @@ -33,9 +34,12 @@ TEST_F(TestJobManager, addJob) qDebug() << "job was really removed"; }); - manager.addJob(sourcePath, [](auto value) -> QVariant { - EXPECT_TRUE(value.toString() == "Application"); - return QVariant::fromValue(true); - }, args); - QThread::sleep(1); // force wait + manager.addJob( + sourcePath, + [](auto value) -> QVariant { + EXPECT_TRUE(value.toString() == "Application"); + return QVariant::fromValue(true); + }, + args); + QThread::sleep(1); // force wait }