From 24794d197e6d27fbfba9790be1da190fe573a058 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 6 Dec 2018 10:05:47 -0500 Subject: Add configuration file over-ride mechanism Reusing the windowmanager on the cluster demo platform requires modifications to the layers.json, areas.db, etc. configuration files. To allow this without breaking potential shared package feeds by building two versions, add a mechanism to allow over-riding the configuration files present in the widget with files in the directory /etc/xdg/windowmanager. Affected code has been refactored to use a new common configuration file path determination helper function to reduce duplication. Bug-AGL: SPEC-1805 Change-Id: Ia3e1af0703794079f9537b934b124788129c045c Signed-off-by: Scott Murray --- src/window_manager.cpp | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'src/window_manager.cpp') diff --git a/src/window_manager.cpp b/src/window_manager.cpp index 42930dc..e9cc53a 100644 --- a/src/window_manager.cpp +++ b/src/window_manager.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2017 TOYOTA MOTOR CORPORATION + * Copyright (c) 2018 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +20,7 @@ #include "window_manager.hpp" #include "json_helper.hpp" +#include "util.hpp" #include "applist.hpp" extern "C" @@ -123,17 +125,7 @@ WindowManager::WindowManager(wl::display *d) id_alloc{}, pending_events(false) { - char const *path_layers_json = getenv("AFM_APP_INSTALL_DIR"); - std::string path; - if (!path_layers_json) - { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - path = std::string(path_layers_json); - } - else - { - path = std::string(path_layers_json) + std::string("/etc/layers.json"); - } + std::string path(get_file_path("layers.json")); try { @@ -1371,19 +1363,7 @@ const char* WindowManager::convertRoleOldToNew(char const *old_role) int WindowManager::loadOldRoleDb() { - // Get afm application installed dir - char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR"); - HMI_DEBUG("wm", "afm_app_install_dir:%s", afm_app_install_dir); - - std::string file_name; - if (!afm_app_install_dir) - { - HMI_ERROR("wm", "AFM_APP_INSTALL_DIR is not defined"); - } - else - { - file_name = std::string(afm_app_install_dir) + std::string("/etc/old_roles.db"); - } + std::string file_name(get_file_path("old_roles.db")); // Load old_role.db json_object* json_obj; -- cgit 1.2.3-korg