Remove hardcoded path for multiuser support

bug-tizen: PTREL-214

Change-Id: Icdef48cc53fe754db9914e1727f2bfe48418497c
Signed-off-by: Sabera Djelti (sdi2) <sabera.djelti@open.eurogiciel.org>

diff --git a/Makefile.am b/Makefile.am
index 716b424..d068e30 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,14 +38,16 @@ libmedia_utils_la_CFLAGS = -I${srcdir}/lib/include \
                              $(DBUS_CFLAGS) \
                              $(SQLITE3_CFLAGS) \
                              $(DB_UTIL_CFLAGS) \
-                             $(PHONESTATUS_CFLAGS)
+                             $(PHONESTATUS_CFLAGS) \
+                             $(TZ_PLATFORM_CONFIG_CFLAGS)
 
 libmedia_utils_la_LIBADD  =   $(GLIB_LIBS) \
                               $(DLOG_LIBS) \
                               $(DBUS_LIBS) \
                              $(SQLITE3_LIBS) \
                              $(DB_UTIL_LIBS) \
-                             $(PHONESTATUS_LIBS)
+                             $(PHONESTATUS_LIBS) \
+                             $(TZ_PLATFORM_CONFIG_LIBS)
 
 
 ### file-manager-server ###

diff --git a/configure.ac b/configure.ac
index 676cd16..fa4630c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,11 @@ PKG_CHECK_MODULES(DB_UTIL, db-util)
 AC_SUBST(DB_UTIL_CFLAGS)
 AC_SUBST(DB_UTIL_LIBS)
 
+#tz-platform-config lib
+PKG_CHECK_MODULES(TZ_PLATFORM_CONFIG, libtzplatform-config)
+AC_SUBST(TZ_PLATFORM_CONFIG_CFLAGS)
+AC_SUBST(TZ_PLATFORM_CONFIG_LIBS)
+
 #ticker noti library
 PKG_CHECK_MODULES(STATUS, notification)
 AC_SUBST(STATUS_CFLAGS)

diff --git a/data/mediasvr b/data/mediasvr
index d109017..893a922 100755 (executable)
--- a/data/mediasvr
+++ b/data/mediasvr
@@ -1,3 +1,6 @@
 #!/bin/sh
-/usr/bin/media-server&
+
+source /etc/tizen-platform.conf
+
+${TZ_SYS_BIN}/media-server&
 

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index 4ae7b54..92f12d5 100755 (executable)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -28,10 +28,12 @@
 #include <media-util-noti.h>
 #include <media-util-ipc.h>
 
+#include <tzplatform_config.h>
+
 #define MOUNT_PATH "/opt/usr"
 
 #define MEDIA_ROOT_PATH_INTERNAL       MOUNT_PATH"/media"
-#define MEDIA_ROOT_PATH_SDCARD "/opt/storage/sdcard"
+#define MEDIA_ROOT_PATH_SDCARD tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard")
 #define MEDIA_DATA_PATH                        MOUNT_PATH"/data/file-manager-service"
 #define MEDIA_DB_NAME                          MOUNT_PATH"/dbspace/.media.db"          /**<  media db name*/
 

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index f181f34..082d2f2 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -22,6 +22,7 @@ BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(db-util)
 BuildRequires:  pkgconfig(notification)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 Description: File manager service server
@@ -38,6 +39,7 @@ Description : media server runtime library.
 Summary:   media server development library.
 Group:     Development/Multimedia
 Requires:  libmedia-utils = %{version}-%{release}
+Requires:  libtzplatform-config-devel
 
 %description -n libmedia-utils-devel
 Description: media server development library.

diff --git a/src/common/include/media-common-external-storage.h b/src/common/include/media-common-external-storage.h
index 3da873d..f381884 100755 (executable)
--- a/src/common/include/media-common-external-storage.h
+++ b/src/common/include/media-common-external-storage.h
@@ -24,6 +24,9 @@
 #include "media-common-types.h"
 
 void
+ms_init_default_path(void);
+
+void
 ms_make_default_path_mmc(void);
 
 int

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 526cacd..31ee9b9 100755 (executable)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -37,6 +37,8 @@
 #include <stdbool.h>
 #include <unistd.h>
 
+#include <tzplatform_config.h>
+
 #define FMS_PERF
 
 #define MS_VALIND 1
@@ -49,7 +51,7 @@
 
 /*Use for Poweroff sequence*/
 #define POWEROFF_NOTI_NAME "power_off_start" /*poeroff noti from system-server*/
-#define POWEROFF_DIR_PATH "/opt/usr/media/_POWER_OFF" /*This path uses for stopping Inotify thread and Socket thread*/
+#define POWEROFF_DIR_PATH tzplatform_mkpath(TZ_USER_CONTENT,"_POWER_OFF") /*This path uses for stopping Inotify thread and Socket thread*/
 #define POWEROFF_DIR_NAME "_POWER_OFF" /*This path uses for stopping Inotify thread and Socket thread*/
 #define POWEROFF -1 /*This number uses for stopping Scannig thread*/
 

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 31358da..3f5bdf7 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -33,7 +33,15 @@
 #include "media-common-drm.h"
 #include "media-common-external-storage.h"
 
+#include <pwd.h>
+#include <tzplatform_config.h>
+
 #define MMC_INFO_SIZE 256
+#define PATH_IMAGES tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard/Images")
+#define PATH_VIDEOS tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard/Videos")
+#define PATH_SOUNDS tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard/Sounds")
+#define PATH_DOWNLOADS tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard/Downloads")
+#define PATH_CAMERA tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard/Camera")
 
 char default_path[][MS_FILE_NAME_LEN_MAX + 1] = {
                {"/opt/storage/sdcard/Images"},
@@ -43,15 +51,26 @@ char default_path[][MS_FILE_NAME_LEN_MAX + 1] = {
                {"/opt/storage/sdcard/Camera"}
 };
 
+
 #define DIR_NUM       ((int)(sizeof(default_path)/sizeof(default_path[0])))
 
 void
+ms_init_default_path(void){
+
+       strcpy (default_path[0], PATH_IMAGES);
+       strcpy (default_path[1], PATH_VIDEOS);
+       strcpy (default_path[2], PATH_SOUNDS);
+       strcpy (default_path[3], PATH_DOWNLOADS);
+       strcpy (default_path[4], PATH_CAMERA);
+}
+
+void
 ms_make_default_path_mmc(void)
 {
        int i = 0;
        int ret = 0;
        DIR *dp = NULL;
-
+       ms_init_default_path();
        for (i = 0; i < DIR_NUM; ++i) {
                dp = opendir(default_path[i]);
                if (dp == NULL) {
@@ -65,7 +84,7 @@ ms_make_default_path_mmc(void)
                        if (ret != 0) {
                                MS_DBG_ERR("chmod failed [%s]", strerror(errno));
                        }
-                       ret = chown(default_path[i], 5000, 5000);
+                       ret = chown(default_path[i], tzplatform_getuid(TZ_USER_NAME), tzplatform_getgid(TZ_SYS_USER_GROUP));
                        if (ret != 0) {
                                MS_DBG_ERR("chown failed [%s]", strerror(errno));
                        }

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index bf84e5f..8ea97cb 100644 (file)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -31,6 +31,8 @@
 #include <glib.h>
 #include "media-util.h"
 
+#include <tzplatform_config.h>
+
 GMainLoop * mainloop = NULL;
 
 void callback(media_request_result_s * result, void *user_data)
@@ -51,8 +53,8 @@ void print_help()
        printf("\n");
        printf("db-update --help for check this messages.\n");
        printf("\n");
-       printf("A file or directory must exists under /opt/usr/media or /opt/storage/sdcard.\n");
-       printf("Using /opt/storage/sdcard is allowed SD card is mounted.\n");
+       printf("A file or directory must exists under %s or %s.\n",tzplatform_mkpath(TZ_USER_CONTENT,""),tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard"));
+       printf("Using %s is allowed SD card is mounted.\n",tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard"));
        printf("\n");
        printf("=======================================================================================\n");
 }

diff --git a/src/scanner/media-scanner-db-svc.c b/src/scanner/media-scanner-db-svc.c
index 5669798..3cdf64b 100755 (executable)
--- a/src/scanner/media-scanner-db-svc.c
+++ b/src/scanner/media-scanner-db-svc.c
@@ -37,7 +37,9 @@
 #include "media-scanner-dbg.h"
 #include "media-scanner-db-svc.h"
 
-#define CONFIG_PATH "/opt/usr/data/file-manager-service/plugin-config"
+#include <tzplatform_config.h>
+
+#define CONFIG_PATH tzplatform_mkpath(TZ_USER_DATA,"file-manager-service/plugin-config")
 #define EXT ".so"
 #define EXT_LEN 3
 #define MSC_REGISTER_COUNT 100 /*For bundle commit*/

diff --git a/src/server/media-server-db-svc.c b/src/server/media-server-db-svc.c
index 3036661..6b0c15c 100755 (executable)
--- a/src/server/media-server-db-svc.c
+++ b/src/server/media-server-db-svc.c
@@ -37,7 +37,9 @@
 #include "media-server-dbg.h"
 #include "media-server-db-svc.h"
 
-#define CONFIG_PATH "/opt/usr/data/file-manager-service/plugin-config"
+#include <tzplatform_config.h>
+
+#define CONFIG_PATH tzplatform_mkpath(TZ_USER_DATA,"file-manager-service/plugin-config")
 #define EXT ".so"
 #define EXT_LEN 3
 

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index 7b3d087..acd0f52 100755 (executable)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -32,8 +32,12 @@
 #include "media-server-socket.h"
 #include "media-server-scanner.h"
 
+#include <tzplatform_config.h>
+
 #define MS_NO_REMAIN_TASK 0
 
+#define MEDIA_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN,"media-scanner")
+
 extern GMainLoop *mainloop;
 extern GArray *owner_list;
 GMutex *scanner_mutex;
@@ -241,7 +245,7 @@ ms_scanner_start(void)
                /* child process */
                MS_DBG_ERR("CHILD PROCESS");
                MS_DBG("EXECUTE MEDIA SCANNER");
-               execl("/usr/bin/media-scanner", "media-scanner", NULL);
+               execl(MEDIA_SERVER_PATH, "media-scanner", NULL);
                g_mutex_unlock(scanner_mutex);
        }
 
@@ -264,4 +268,4 @@ void ms_reset_scanner_status(void)
 int ms_get_scanner_pid(void)
 {
        return child_pid;
-}
\ No newline at end of file
+}

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index adaacf2..23bfbdf 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -27,6 +27,8 @@
 #include "media-server-dbg.h"
 #include "media-server-thumb.h"
 
+#include <tzplatform_config.h>
+
 #ifdef LOG_TAG
 #undef LOG_TAG
 #endif
@@ -35,6 +37,8 @@
 
 #define THUMB_SERVER_NAME "media-thumbnail"
 
+#define THUMB_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN,"media-thumbnail-server")
+
 gboolean _ms_thumb_agent_timer();
 
 static GMainLoop *g_thumb_agent_loop = NULL;
@@ -488,7 +492,7 @@ gboolean _ms_thumb_agent_execute_server()
        if (pid < 0) {
                return FALSE;
        } else if (pid == 0) {
-               execl("/usr/bin/media-thumbnail-server", "media-thumbnail-server", NULL);
+               execl(THUMB_SERVER_PATH, "media-thumbnail-server", NULL);
        } else {
                MS_DBG("Child process is %d", pid);
                g_folk_thumb_server = TRUE;