Merge lp:~unity-team/url-dispatcher/mediaplayer-still-deb into lp:url-dispatcher/13.10

[Michal Hruby]

Revert the definition change for mediaplayer, it'll remain a non-click app for now.

Revert the definition change for mediaplayer, it'll remain a non-click app for now.

Note that music is still considered a click pkg, so activating music results will not work until later today when the music app will be turned into proper click app.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/87/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/87/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/87/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/url-dispatcher-ci/87/rebuild

review: Needs Fixing (continuous-integration)

[Thomas Strehl (strehl-t)]

Lines 111 and 116 in dispatcher-test.cc might need to be changed to:

ASSERT_STREQ("mediaplayer-app", upstart_app_launch_mock_get_last_app_id());

[lp:~unity-team/url-dispatcher/mediaplayer-still-deb]

39. By Michal Hruby on 2013-10-14

Fix test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/url-dispatcher-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-armhf-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/url-dispatcher-saucy-i386-ci/88

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/url-dispatcher-ci/88/rebuild

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

while not familiar with the code, it is correct that mediaplayer will be a legacy app and use the app_id seen in the MR

review: Approve

[Loïc Minier (lool)]

Looks good to me.

review: Approve

=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2013-10-08 21:15:13 +0000
+++ service/dispatcher.c	2013-10-14 12:09:27 +0000
@@ -426,19 +426,15 @@
 	{
 		.regex_patern = "^video:///",
 		.regex_object = NULL,
-		.app_id = NULL,
-		.package = "com.ubuntu.mediaplayer",
-		.application = "mediaplayer",
-		.version = CURRENT
+		.package = NULL, .application = NULL, .version = NULL,
+		.app_id = "mediaplayer-app"
 	},
 	{
 		/* TODO: This is temporary for 13.10, we expect to be smarter in the future */
 		.regex_patern = "^file:///home/" USERNAME_REGEX "/Videos/",
 		.regex_object = NULL,
-		.app_id = NULL,
-		.package = "com.ubuntu.mediaplayer",
-		.application = "mediaplayer",
-		.version = CURRENT
+		.package = NULL, .application = NULL, .version = NULL,
+		.app_id = "mediaplayer-app"
 	},
 	/* Web Stuff */
 	{

=== removed file 'tests/click-data/.click/info/com.ubuntu.mediaplayer.manifest'
--- tests/click-data/.click/info/com.ubuntu.mediaplayer.manifest	2013-10-08 21:21:00 +0000
+++ tests/click-data/.click/info/com.ubuntu.mediaplayer.manifest	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-{
-	"version": "2.1.4",
-	"name": "com.ubuntu.mediaplayer",
-	"hooks": {
-		"mediaplayer": {
-			"test": "test"
-		}
-	}
-}

=== modified file 'tests/dispatcher-test.cc'
--- tests/dispatcher-test.cc	2013-10-08 21:27:34 +0000
+++ tests/dispatcher-test.cc	2013-10-14 12:09:27 +0000
@@ -108,12 +108,12 @@
 {
 	/* Base Video */
 	dispatch_url("video:///foo.mp4");
-	ASSERT_STREQ("com.ubuntu.mediaplayer_mediaplayer_2.1.4", upstart_app_launch_mock_get_last_app_id());
+	ASSERT_STREQ("mediaplayer-app", upstart_app_launch_mock_get_last_app_id());
 	upstart_app_launch_mock_clear_last_app_id();
 
 	/* File Video */
 	dispatch_url("file:///home/bar/Videos/foo.mp4");
-	ASSERT_STREQ("com.ubuntu.mediaplayer_mediaplayer_2.1.4", upstart_app_launch_mock_get_last_app_id());
+	ASSERT_STREQ("mediaplayer-app", upstart_app_launch_mock_get_last_app_id());
 	upstart_app_launch_mock_clear_last_app_id();
 
 	return;