Merge lp:~ted/url-dispatcher/more-sophisticated-urls into lp:url-dispatcher/15.04

[Ted Gould]

Making generic regular expression more robust

Turns out some people need some more flexibility in our URLs. Let's give it to them.

[Charles Kerr (charlesk)]

Discussion @ https://code.launchpad.net/~ted/url-dispatcher/more-sophisticated-urls/+merge/240006

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:82
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/154/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/url-dispatcher-ci/154/rebuild

review: Approve (continuous-integration)

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2014-09-22 14:46:06 +0000
+++ service/dispatcher.c	2014-10-29 14:49:19 +0000
@@ -370,6 +370,7 @@
 		gchar * domain = g_match_info_fetch(genericmatch, 2);
 
 		*out_appid = url_db_find_url(urldb, protocol, domain);
+		g_debug("Protocol '%s' for domain '%s' resulting in app id '%s'", protocol, domain, *out_appid);
 
 		if (*out_appid != NULL) {
 			found = TRUE;
@@ -448,7 +449,7 @@
 
 	applicationre = g_regex_new("^application:///([a-zA-Z0-9_\\.-]*)\\.desktop$", 0, 0, NULL);
 	appidre = g_regex_new("^appid://([a-z0-9\\.-]*)/([a-zA-Z0-9-]*)/([a-zA-Z0-9\\.-]*)$", 0, 0, NULL);
-	genericre = g_regex_new("^(.*)://([a-z0-9\\.-]*)?/?(.*)?$", 0, 0, NULL);
+	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)(a-z0-9\\.-]*)(?::[0-9])/)?(.*)?$", 0, 0, NULL);
 
 	g_bus_get(G_BUS_TYPE_SESSION, cancellable, bus_got, mainloop);
 

=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc	2014-09-22 14:46:06 +0000
+++ tests/dispatcher-test.cc	2014-10-29 14:49:19 +0000
@@ -43,6 +43,12 @@
 			url_db_set_file_motification_time(db, "/testdir/com.ubuntu.calendar_calendar_9.8.2343.url-dispatcher", &timestamp);
 			url_db_insert_url(db, "/testdir/com.ubuntu.calendar_calendar_9.8.2343.url-dispatcher", "calendar", NULL);
 
+			url_db_set_file_motification_time(db, "/testdir/com.ubuntu.dialer_dialer_1234.url-dispatcher", &timestamp);
+			url_db_insert_url(db, "/testdir/com.ubuntu.dialer_dialer_1234.url-dispatcher", "tel", NULL);
+
+			url_db_set_file_motification_time(db, "/testdir/magnet-test.url-dispatcher", &timestamp);
+			url_db_insert_url(db, "/testdir/magnet-test.url-dispatcher", "magnet", NULL);
+
 			sqlite3_close(db);
 
 			testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
@@ -152,3 +158,38 @@
 
 	return;
 }
+
+TEST_F(DispatcherTest, DialerTest)
+{
+	gchar * out_appid = NULL;
+	const gchar * out_url = NULL;
+
+	/* Base Telephone */
+	EXPECT_TRUE(dispatcher_url_to_appid("tel:[phone]", &out_appid, &out_url));
+	EXPECT_STREQ("com.ubuntu.dialer_dialer_1234", out_appid);
+	g_free(out_appid);
+
+	/* Tel with bunch of commas */
+	EXPECT_TRUE(dispatcher_url_to_appid("tel:911,,,1,,1,,2", &out_appid, &out_url));
+	EXPECT_STREQ("com.ubuntu.dialer_dialer_1234", out_appid);
+	g_free(out_appid);
+
+	/* Telephone with slashes */
+	EXPECT_TRUE(dispatcher_url_to_appid("tel:///[phone]", &out_appid, &out_url));
+	EXPECT_STREQ("com.ubuntu.dialer_dialer_1234", out_appid);
+	g_free(out_appid);
+
+	return;
+}
+
+TEST_F(DispatcherTest, MagnetTest)
+{
+	gchar * out_appid = NULL;
+	const gchar * out_url = NULL;
+
+	EXPECT_TRUE(dispatcher_url_to_appid("magnet:?xt=urn:ed2k:31D6CFE0D16AE931B73C59D7E0C089C0&xl=0&dn=zero_len.fil&xt=urn:bitprint:3I42H3S6NNFQ2MSVX7XZKYAYSCX5QBYJ.LWPNACQDBZRYXW3VHJVCJ64QBZNGHOHHHZWCLNQ&xt=urn:md5:D41D8CD98F00B204E9800998ECF8427E", &out_appid, &out_url));
+	EXPECT_STREQ("magnet-test", out_appid);
+	g_free(out_appid);
+
+	return;
+}