Merge lp:~ted/url-dispatcher/lp1340952-drop-file-urls into lp:url-dispatcher/14.10

[Ted Gould]

Drop file based URLs for Music and Video

Getting rid of these URLs as they're more restrictive than media scanner and AppArmor, who are the folks that should be doing the restrictions.

Don't land this without other branches attached to the bug, as then things will break.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/14

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

> Don't land this without other branches attached to the bug, as then things will break.

There aren't any other branches attached to this bug...?

[lp:~ted/url-dispatcher/lp1340952-drop-file-urls]

62. By Ted Gould on 2014-09-22

Updating to trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-amd64-ci/42/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-utopic-i386-ci/40/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2014-09-02 20:39:03 +0000
+++ service/dispatcher.c	2014-09-22 14:46:32 +0000
@@ -31,8 +31,6 @@
 static GRegex * applicationre = NULL;
 static GRegex * appidre = NULL;
 static GRegex * genericre = NULL;
-static GRegex * musicfilere = NULL; /* FIXME */
-static GRegex * videofilere = NULL; /* FIXME */
 static sqlite3 * urldb = NULL;
 
 /* Errors */
@@ -364,34 +362,6 @@
 	}
 	g_match_info_free(appmatch);
 
-	/* start FIXME: These are needed work arounds until everything migrates away
-	   from them.  Ewww */
-	GMatchInfo * musicmatch = NULL;
-	if (g_regex_match(musicfilere, url, 0, &musicmatch)) {
-		gboolean retval = FALSE;
-
-		*out_appid = ubuntu_app_launch_triplet_to_app_id("com.ubuntu.music", "music", NULL);
-		if (*out_appid != NULL) {
-			*out_url = url;
-			retval = TRUE;
-		}
-
-		g_match_info_free(musicmatch);
-		return retval;
-	}
-	g_match_info_free(musicmatch);
-
-	GMatchInfo * videomatch = NULL;
-	if (g_regex_match(videofilere, url, 0, &videomatch)) {
-		*out_appid = g_strdup("mediaplayer-app");
-		*out_url = url;
-
-		g_match_info_free(videomatch);
-		return TRUE;
-	}
-	g_match_info_free(videomatch);
-	/* end FIXME: Making the ugly stop */
-
 	/* Check the URL db */
 	GMatchInfo * genericmatch = NULL;
 	if (g_regex_match(genericre, url, 0, &genericmatch)) {
@@ -468,8 +438,6 @@
 	return;
 }
 
-#define USERNAME_REGEX  "[a-zA-Z0-9_\\-]*"
-
 /* Initialize all the globals */
 gboolean
 dispatcher_init (GMainLoop * mainloop)
@@ -482,10 +450,6 @@
 	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);
 
-	/* FIXME: Legacy */
-	musicfilere = g_regex_new("^file:///home/" USERNAME_REGEX "/Music/", 0, 0, NULL);
-	videofilere = g_regex_new("^file:///home/" USERNAME_REGEX "/Videos/", 0, 0, NULL);
-
 	g_bus_get(G_BUS_TYPE_SESSION, cancellable, bus_got, mainloop);
 
 	skel = service_iface_com_canonical_urldispatcher_skeleton_new();
@@ -506,8 +470,6 @@
 	g_regex_unref(applicationre);
 	g_regex_unref(appidre);
 	g_regex_unref(genericre);
-	g_regex_unref(musicfilere); /* FIXME */
-	g_regex_unref(videofilere); /* FIXME */
 	sqlite3_close(urldb);
 
 	return TRUE;

=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc	2014-08-25 20:15:10 +0000
+++ tests/dispatcher-test.cc	2014-09-22 14:46:32 +0000
@@ -152,25 +152,3 @@
 
 	return;
 }
-
-/* FIXME: These should go away */
-TEST_F(DispatcherTest, FixmeTest)
-{
-	gchar * out_appid = NULL;
-	const gchar * out_url = NULL;
-
-	/* File Video */
-	dispatcher_url_to_appid("file:///home/bar/Videos/foo.mp4", &out_appid, &out_url);
-	dispatcher_send_to_app(out_appid, out_url);
-	ASSERT_STREQ("mediaplayer-app", ubuntu_app_launch_mock_get_last_app_id());
-	ubuntu_app_launch_mock_clear_last_app_id();
-
-	/* File Video */
-	dispatcher_url_to_appid("file:///home/bar/Music/The_Bars_Live.mp3", &out_appid, &out_url);
-	dispatcher_send_to_app(out_appid, out_url);
-	ASSERT_STREQ("com.ubuntu.music_music_1.5.4", ubuntu_app_launch_mock_get_last_app_id());
-	ubuntu_app_launch_mock_clear_last_app_id();
-
-	return;
-}
-