status-im
/
snorenotify
mirror of https://github.com/status-im/snorenotify.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve cli of snoresettings

This commit is contained in:
Patrick von Reth 2015-07-22 18:55:58 +02:00
parent bcc6e33194
commit 1bc23391d7
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/settings/main.cpp
View File

@ -42,10 +42,14 @@ void listSettings(SettingsType type, const QString &application)
return settings.allKeys();
};
QString prefix = application;
if(application == QLatin1String("global")) {
prefix = QString();
}
cout << qPrintable(application) << endl;
for (const QString &key : SettingsWindow::allSettingsKeysWithPrefix(
Utils::normalizeSettingsKey(QLatin1String(""), type, application), settings, getAllKeys)) {
cout << " " << qPrintable(key) << ": " << qPrintable(settings.value(Utils::normalizeSettingsKey(key, type, application)).toString()) << endl;
Utils::normalizeSettingsKey(QLatin1String(""), type, prefix), settings, getAllKeys)) {
cout << " " << qPrintable(key) << ": " << qPrintable(settings.value(Utils::normalizeSettingsKey(key, type, prefix)).toString()) << endl;
}
}
@ -59,6 +63,7 @@ int main(int argc, char *argv[])
app.setOrganizationName(QLatin1String("SnoreNotify"));
app.setApplicationVersion(Snore::Version::version());
Snore::SnoreCore::instance().loadPlugins(Snore::SnorePlugin::ALL);
Snore::SnoreCorePrivate::instance()->defaultApplication().hints().setValue("use-markup", QVariant::fromValue(true));
@ -74,34 +79,26 @@ int main(int argc, char *argv[])
QCommandLineOption listSettingsCommand({QLatin1String("l"), QLatin1String("list")} , QLatin1String("List settings for the given --appName or the global settings."));
parser.addOption(listSettingsCommand);
QCommandLineOption appNameCommand({QLatin1String("a"), QLatin1String("appName")} , QLatin1String("Set the Name of the app <app>."), QLatin1String("app"), QLatin1String("GlobalSettings"));
QCommandLineOption appNameCommand({QLatin1String("a"), QLatin1String("appName")} , QLatin1String("Set the Name of the app <app> or global."), QLatin1String("app"), QLatin1String("global"));
parser.addOption(appNameCommand);
QCommandLineOption typeCommand({QLatin1String("t"), QLatin1String("type")} , QLatin1String("Type of the setting [global|local]."), QLatin1String("type"));
parser.addOption(typeCommand);
parser.addPositionalArgument(QLatin1String("key"), QLatin1String("The settings Key."));
parser.addPositionalArgument(QLatin1String("value"), QLatin1String("The new settings Value"));
parser.process(app);
QString appName = parser.value(appNameCommand);
SettingsType type = GLOBAL_SETTING;
if (parser.isSet(typeCommand)) {
QString typeName = parser.value(typeCommand);
if (typeName != QLatin1String("global") && typeName == QLatin1String("local")) {
type = LOCAL_SETTING;
} else {
parser.showHelp(1);
}
}
if (parser.isSet(appNameCommand)) {
if(appName != QLatin1String("global")){
type = LOCAL_SETTING;
}
if (parser.isSet(listAppsCommand)) {
listApps();
} else if (parser.isSet(listSettingsCommand)) {
listSettings(type, parser.value(appNameCommand));
listSettings(type, appName);
} else if (parser.optionNames().empty() && parser.positionalArguments().empty()) {
window = new SettingsWindow();
window->show();
@ -111,10 +108,6 @@ int main(int argc, char *argv[])
if (posArgs.size() != 2) {
parser.showHelp(1);
}
QString appName;
if (parser.isSet(appNameCommand)) {
appName = parser.value(appNameCommand);
}
if (!setSetting(appName, type, posArgs[0], posArgs[1])) {
return 1;
}