crtxcr/qsrun
1
0
Förgrening 0
Kod Ärenden 29 Pull-förfrågningar 1 Släpp Aktiviteter

EntryProvider: Introduce isSavable() to avoid code duplicates

Bläddra i källkod
This commit is contained in:
Albert S. 2020-10-08 22:39:41 +02:00
förälder 38cc87fbcd
incheckning ac5498990b
2 ändrade filer med 8 tillägg och 2 borttagningar
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
entryprovider.cpp
Visa fil

@ -13,6 +13,11 @@ EntryProvider::EntryProvider(QStringList userEntriesDirsPaths, QStringList syste
<< "%u"; << "%u";
} }
bool EntryProvider::isSavable(const EntryConfig &config) const
{
return ! config.entryPath.isEmpty() && (config.type == EntryType::USER || config.type == EntryType::INHERIT);
}
EntryConfig EntryProvider::readFromDesktopFile(const QString &path) EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
{ {
EntryConfig result; EntryConfig result;
@ -285,7 +290,7 @@ QVector<EntryConfig> EntryProvider::getSystemEntries()
void EntryProvider::saveUserEntry(const EntryConfig &config) void EntryProvider::saveUserEntry(const EntryConfig &config)
{ {
if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty()) if(!isSavable(config))
{ {
throw std::runtime_error("Only user/inherited entries can be saved"); throw std::runtime_error("Only user/inherited entries can be saved");
} }
@ -339,7 +344,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
bool EntryProvider::deleteUserEntry(const EntryConfig &config) bool EntryProvider::deleteUserEntry(const EntryConfig &config)
{ {
if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty()) if(!isSavable(config))
{ {
throw std::runtime_error("Only user/inherited entries can be deleted"); throw std::runtime_error("Only user/inherited entries can be deleted");
} }

1
entryprovider.h
Visa fil

@ -55,6 +55,7 @@ class EntryProvider
public: public:
EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths); EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths);
bool isSavable(const EntryConfig &config) const;
QVector<EntryConfig> getUserEntries(); QVector<EntryConfig> getUserEntries();
QVector<EntryConfig> getSystemEntries(); QVector<EntryConfig> getSystemEntries();
void saveUserEntry(const EntryConfig &config); void saveUserEntry(const EntryConfig &config);