Merge lp:~larryprice/url-dispatcher/appid-with-dots into lp:url-dispatcher/touch-vivid

[Ted Gould]

App ID should allow package names with dots.

[Ted Gould (ted)]

Backporting to vivid. Same review.

review: Approve

Unmerged revisions

93. By Larry Price on 2016-08-04

Adding test

92. By Larry Price on 2016-08-04

Accept '.' in appid for libertine apps

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-11 21:38:13 +0000
+++ CMakeLists.txt	2016-11-07 16:40:58 +0000
@@ -3,7 +3,7 @@
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
 
-if (${cmake_build_type_lower} STREQUAL debug)
+if ("${cmake_build_type_lower}" STREQUAL "debug")
   option (werror "Treat warnings as errors." FALSE)
 else()
   option (werror "Treat warnings as errors." TRUE)
@@ -30,7 +30,7 @@
 include(UseConstantBuilder)
 
 # Workaround for libexecdir on debian
-if (EXISTS "/etc/debian_version") 
+if (EXISTS "/etc/debian_version")
   set(CMAKE_INSTALL_LIBEXECDIR ${CMAKE_INSTALL_LIBDIR})
   set(CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}")
 endif()
@@ -42,7 +42,7 @@
 # Since gdbus-codegen does not produce warning-free code
 # and we use -Werror, only enable these warnings for debug
 # builds. Drop this once the issue has been fixed and landed.
-if (${cmake_build_type_lower} STREQUAL debug)
+if ("${cmake_build_type_lower}" STREQUAL debug)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpedantic")# -Wextra")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic -Wextra")
 endif()
@@ -50,7 +50,7 @@
 if (${werror})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
   set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-endif() 
+endif()
 
 pkg_check_modules(UBUNTU_APP_LAUNCH REQUIRED ubuntu-app-launch-2>=0.5)
 include_directories(${UBUNTU_APP_LAUNCH_INCLUDE_DIRS})
@@ -115,4 +115,3 @@
   endif ()
   add_subdirectory(tests)
 endif ()
-
 
=== modified file 'service/dispatcher.c'
--- service/dispatcher.c	2015-09-03 21:50:06 +0000
+++ service/dispatcher.c	2016-11-07 16:40:58 +0000
@@ -556,7 +556,7 @@
 	g_return_val_if_fail(urldb != NULL, FALSE);
 
 	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);
+	appidre = g_regex_new("^appid://([a-z0-9\\.-]*)/([a-zA-Z0-9-\\.]*)/([a-zA-Z0-9\\.-]*)$", 0, 0, NULL);
 	genericre = g_regex_new("^([a-z][a-z0-9]*):(?://(?:.*@)?([a-zA-Z0-9\\.-]*)(?::[0-9]*)?/?)?(.*)?$", 0, 0, NULL);
 	intentre = g_regex_new("^intent://.*package=([a-zA-Z0-9\\.]*);.*$", 0, 0, NULL);
 
 
=== modified file 'tests/app-id-test.cc'
--- tests/app-id-test.cc	2015-05-15 21:24:15 +0000
+++ tests/app-id-test.cc	2016-11-07 16:40:58 +0000
@@ -88,6 +88,18 @@
 	g_clear_pointer(&out_appid, g_free);
 	out_url = nullptr;
 
+	/* App ID with periods */
+	dispatcher_url_to_appid("appid://container-id/org.canonical.app1/0.0", &out_appid, &out_url);
+	ASSERT_STREQ("container-id_org.canonical.app1_0.0", out_appid);
+	EXPECT_EQ(nullptr, out_url);
+
+	dispatcher_send_to_app(out_appid, out_url);
+	EXPECT_STREQ("container-id_org.canonical.app1_0.0", ubuntu_app_launch_mock_get_last_app_id());
+
+	ubuntu_app_launch_mock_clear_last_app_id();
+	g_clear_pointer(&out_appid, g_free);
+	out_url = nullptr;
+
 	/* No version at all */
 	dispatcher_url_to_appid("appid://com.test.good/app1", &out_appid, &out_url);