Merge lp:~mardy/ubuntu-system-settings/lp1227690 into lp:ubuntu-system-settings

[Alberto Mardegan]

Parse URLs given in command line

Parse URLs given in command line

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/417/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/417

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/417/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

looks fine and works as expected

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-08-02 12:08:52 +0000
+++ .bzrignore	2013-09-30 09:32:01 +0000
@@ -17,4 +17,5 @@
 /lib/SystemSettings/SystemSettings.pc
 /po/*.mo
 /src/system-settings
+/tests/tst_arguments
 /tests/tst_plugins

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-09-23 12:33:27 +0000
+++ src/main.cpp	2013-09-30 09:32:01 +0000
@@ -21,6 +21,7 @@
 #include "debug.h"
 #include "i18n.h"
 #include "plugin-manager.h"
+#include "utils.h"
 
 #include <QGuiApplication>
 #include <QProcessEnvironment>
@@ -75,17 +76,7 @@
      */
     QString defaultPlugin;
     QVariantMap pluginOptions;
-    QStringList arguments = app.arguments();
-    for (int i = 1; i < arguments.count(); i++) {
-        const QString &argument = arguments.at(i);
-        if (!argument.startsWith('-')) {
-            defaultPlugin = argument;
-        } else if (argument == "--option" && i + 1 < arguments.count()) {
-            QStringList option = arguments.at(++i).split("=");
-            // If no value is given, insert an empty string
-            pluginOptions.insert(option.at(0), option.value(1, ""));
-        }
-    }
+    parsePluginOptions(app.arguments(), defaultPlugin, pluginOptions);
 
     QQuickView view;
     QObject::connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()),

=== modified file 'src/system-settings.pro'
--- src/system-settings.pro	2013-08-01 15:01:59 +0000
+++ src/system-settings.pro	2013-09-30 09:32:01 +0000
@@ -25,7 +25,8 @@
     i18n.h \
     item-model.h \
     plugin-manager.h \
-    plugin.h
+    plugin.h \
+    utils.h
 
 SOURCES = \
     debug.cpp \
@@ -33,7 +34,8 @@
     item-model.cpp \
     main.cpp \
     plugin-manager.cpp \
-    plugin.cpp
+    plugin.cpp \
+    utils.cpp
 
 QML_SOURCES = \
     qml/CategoryGrid.qml \

=== added file 'src/utils.cpp'
--- src/utils.cpp	1970-01-01 00:00:00 +0000
+++ src/utils.cpp	2013-09-30 09:32:01 +0000
@@ -0,0 +1,62 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "debug.h"
+#include "utils.h"
+
+#include <QUrl>
+#include <QUrlQuery>
+
+
+typedef QPair<QString,QString> StringPair;
+
+namespace SystemSettings {
+
+void parsePluginOptions(const QStringList &arguments, QString &defaultPlugin,
+                        QVariantMap &pluginOptions)
+{
+    for (int i = 1; i < arguments.count(); i++) {
+        const QString &argument = arguments.at(i);
+        if (argument.startsWith("settings://")) {
+            QUrl urlArgument(argument);
+            /* Find out which plugin is required. If the first component of the
+             * path is "system", just skip it. */
+            QStringList pathComponents =
+                urlArgument.path().split('/', QString::SkipEmptyParts);
+            int pluginIndex = 0;
+            if (pathComponents.value(pluginIndex, "") == "system")
+                pluginIndex++;
+            defaultPlugin = pathComponents.value(pluginIndex, QString());
+            /* Convert the query parameters into options for the plugin */
+            QUrlQuery query(urlArgument);
+            Q_FOREACH(const StringPair &pair, query.queryItems()) {
+                pluginOptions.insert(pair.first, pair.second);
+            }
+        } else if (!argument.startsWith('-')) {
+            defaultPlugin = argument;
+        } else if (argument == "--option" && i + 1 < arguments.count()) {
+            QStringList option = arguments.at(++i).split("=");
+            // If no value is given, insert an empty string
+            pluginOptions.insert(option.at(0), option.value(1, ""));
+        }
+    }
+}
+
+} // namespace

=== added file 'src/utils.h'
--- src/utils.h	1970-01-01 00:00:00 +0000
+++ src/utils.h	2013-09-30 09:32:01 +0000
@@ -0,0 +1,34 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SYSTEM_SETTINGS_UTILS_H
+#define SYSTEM_SETTINGS_UTILS_H
+
+#include <QStringList>
+#include <QVariantMap>
+
+namespace SystemSettings {
+
+void parsePluginOptions(const QStringList &arguments, QString &defaultPlugin,
+                        QVariantMap &pluginOptions);
+
+} // namespace
+
+#endif // SYSTEM_SETTINGS_UTILS_H

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2013-05-09 10:32:25 +0000
+++ tests/tests.pro	2013-09-30 09:32:01 +0000
@@ -2,4 +2,5 @@
 CONFIG += ordered
 SUBDIRS = \
     plugin.pro \
+    tst_arguments.pro \
     tst_plugins.pro

=== added file 'tests/tst_arguments.cpp'
--- tests/tst_arguments.cpp	1970-01-01 00:00:00 +0000
+++ tests/tst_arguments.cpp	2013-09-30 09:32:01 +0000
@@ -0,0 +1,112 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QTest>
+
+using namespace SystemSettings;
+
+class ArgumentsTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    ArgumentsTest() {};
+
+private Q_SLOTS:
+    void testNull();
+    void testDefaultPlugin();
+    void testPluginOptions();
+    void testObsoleted();
+};
+
+void ArgumentsTest::testNull()
+{
+    QStringList args(QStringLiteral("appName"));
+    QString defaultPlugin;
+    QVariantMap pluginOptions;
+    parsePluginOptions(args, defaultPlugin, pluginOptions);
+
+    QCOMPARE(defaultPlugin, QString());
+    QCOMPARE(pluginOptions, QVariantMap());
+}
+
+void ArgumentsTest::testDefaultPlugin()
+{
+    QStringList args(QStringLiteral("appName"));
+    args << QStringLiteral("settings://system/myPlugin");
+
+    QString defaultPlugin;
+    QVariantMap pluginOptions;
+    parsePluginOptions(args, defaultPlugin, pluginOptions);
+
+    QCOMPARE(defaultPlugin, QStringLiteral("myPlugin"));
+    QCOMPARE(pluginOptions, QVariantMap());
+
+    /* Also check the host-less syntax */
+    args = QStringList(QStringLiteral("appName"));
+    args << QStringLiteral("settings:///system/myPlugin");
+
+    defaultPlugin.clear();
+    parsePluginOptions(args, defaultPlugin, pluginOptions);
+
+    QCOMPARE(defaultPlugin, QStringLiteral("myPlugin"));
+    QCOMPARE(pluginOptions, QVariantMap());
+}
+
+void ArgumentsTest::testPluginOptions()
+{
+    QStringList args(QStringLiteral("appName"));
+    args << QStringLiteral("settings:///system/myPlugin?greeting=hello&count=1");
+
+    QString defaultPlugin;
+    QVariantMap pluginOptions;
+    parsePluginOptions(args, defaultPlugin, pluginOptions);
+
+    QCOMPARE(defaultPlugin, QStringLiteral("myPlugin"));
+    QVariantMap expectedOptions;
+    expectedOptions.insert("greeting", QStringLiteral("hello"));
+    expectedOptions.insert("count", QStringLiteral("1"));
+    QCOMPARE(pluginOptions, expectedOptions);
+}
+
+void ArgumentsTest::testObsoleted()
+{
+    QStringList args(QStringLiteral("appName"));
+    args << QStringLiteral("myPlugin");
+    args << QStringLiteral("--option") << QStringLiteral("greeting=hello");
+    args << QStringLiteral("--option") << QStringLiteral("count=1");
+
+    QString defaultPlugin;
+    QVariantMap pluginOptions;
+    parsePluginOptions(args, defaultPlugin, pluginOptions);
+
+    QCOMPARE(defaultPlugin, QStringLiteral("myPlugin"));
+    QVariantMap expectedOptions;
+    expectedOptions.insert("greeting", QStringLiteral("hello"));
+    expectedOptions.insert("count", QStringLiteral("1"));
+    QCOMPARE(pluginOptions, expectedOptions);
+}
+
+QTEST_MAIN(ArgumentsTest);
+#include "tst_arguments.moc"

=== added file 'tests/tst_arguments.pro'
--- tests/tst_arguments.pro	1970-01-01 00:00:00 +0000
+++ tests/tst_arguments.pro	2013-09-30 09:32:01 +0000
@@ -0,0 +1,31 @@
+include(../common-project-config.pri)
+include($${TOP_SRC_DIR}/common-vars.pri)
+
+TARGET = tst_arguments
+
+CONFIG += \
+    debug
+
+QT += \
+    core \
+    qml \
+    testlib
+
+SRC_DIR = $$TOP_SRC_DIR/src
+SOURCES += \
+    tst_arguments.cpp \
+    $$SRC_DIR/utils.cpp
+HEADERS += \
+    $$SRC_DIR/utils.cpp
+
+INCLUDEPATH += \
+    . \
+    $$SRC_DIR
+
+DEFINES += \
+    DEBUG_ENABLED \
+    UNIT_TESTS
+
+check.commands = "xvfb-run -a ./$$TARGET"
+check.depends = $$TARGET
+QMAKE_EXTRA_TARGETS += check