Merge lp:~laney/ubuntu-system-settings/urihandler into lp:ubuntu-system-settings

[Iain Lane]

Use UriHandler to handle requests to switch to new pages in an existing instance.

Use UriHandler to handle requests to switch to new pages in an existing instance.

There's some JS to handle passing options to panels too.

Test it on your desktop:

 - apt-get install url-dispatcher upstart-app-launch-tools
 - start url-dispatcher
 - tail -f ~/.cache/upstart/application-legacy-ubuntu-system-settings-.log
 - upstart-app-launch ubuntu-system-settings settings:///system/...
 - (repeat the last command to switch panels)

And watch the tail output.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/464/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks good, works as well.

review: Approve

[Sebastien Bacher (seb128)]

I've reviewed/tried it yesterday, seems to work fine indeed

review: Approve

=== modified file 'src/qml/MainWindow.qml'
--- src/qml/MainWindow.qml	2013-10-07 17:15:22 +0000
+++ src/qml/MainWindow.qml	2013-10-10 17:16:30 +0000
@@ -29,21 +29,66 @@
     applicationName: "SystemSettings"
     automaticOrientation: true
 
+    function loadPluginByName(pluginName, pluginOptions) {
+        var plugin = pluginManager.getByName(pluginName)
+        var opts = { plugin: plugin,
+                     pluginManager: pluginManager }
+
+        if (pluginOptions)
+            opts.pluginOptions = pluginOptions
+
+        if (plugin) {
+            // Got a valid plugin name - load it
+            var pageComponent = plugin.pageComponent
+            if (pageComponent) {
+                pageStack.push(pageComponent, opts)
+                return true
+            }
+        } else {
+            // Invalid plugin
+            console.log("Plugin " + pluginName + " does not exist.")
+            return false
+        }
+    }
+
     Component.onCompleted: {
         i18n.domain = "ubuntu-system-settings"
         pageStack.push(mainPage)
         if (defaultPlugin) {
-            var plugin = pluginManager.getByName(defaultPlugin)
-            if (plugin) {
-                // Got a valid plugin name - load it
-                var pageComponent = plugin.pageComponent
-                if (pageComponent)
-                    pageStack.push(pageComponent, { plugin: plugin, pluginManager: pluginManager })
+            if (!loadPluginByName(defaultPlugin))
+                Qt.quit()
+        }
+    }
+
+    Connections {
+        target: UriHandler
+        onOpened: {
+            var url = String(uris)
+            var panelAndOptions = url.replace("settings:///system/", "")
+            var optionIndex = panelAndOptions.indexOf("?")
+            var panel = optionIndex > -1 ?
+                        panelAndOptions.substring(0, optionIndex) :
+                        panelAndOptions
+            var urlParams = {}
+            // Parse URL options
+            // From http://stackoverflow.com/a/2880929
+            if (optionIndex > -1) { // Got options
+                var match,
+                    // Regex for replacing addition symbol with a space
+                    pl     = /\+/g,
+                    search = /([^&=]+)=?([^&]*)/g,
+                    decode = function (s) {
+                        return decodeURIComponent(s.replace(pl, " "))
+                    }
+                while (match = search.exec(
+                           panelAndOptions.substring(optionIndex + 1)))
+                       urlParams[decode(match[1])] = decode(match[2])
+
+                loadPluginByName(panel, urlParams)
             } else {
-                // Invalid plugin passed on the commandline
-                console.log("Plugin " + defaultPlugin + " does not exist.")
-                Qt.quit()
+                loadPluginByName(panel)
             }
+
         }
     }