Merge function for getting thumbnail folder

Change-Id: I20588debed3b2ef14e37c91ebd1d56884c616fb1
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/lib/include/media-util-user.h b/lib/include/media-util-user.h
index 4d4835e..9da4203 100755 (executable)
--- a/lib/include/media-util-user.h
+++ b/lib/include/media-util-user.h
@@ -33,8 +33,7 @@ typedef enum {
 int ms_user_get_internal_root_path(uid_t uid, char **path);
 int ms_user_get_storage_type(uid_t uid, const char *path, ms_user_storage_type_e *storage_type);
 int ms_user_get_root_thumb_store_path(uid_t uid, char **path);
-int ms_user_get_default_thumb_store_path(uid_t uid, char **path);
-int ms_user_get_mmc_thumb_store_path(uid_t uid, char **path);
+int ms_user_get_thumb_store_path(uid_t uid, ms_user_storage_type_e storage_type, char **path);
 int ms_user_get_media_db_path(uid_t uid, char **path);
 
 #ifdef __cplusplus

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index 987f62f..f788cba 100755 (executable)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -130,41 +130,24 @@ int ms_user_get_root_thumb_store_path(uid_t uid, char **path)
 
        return ret;
 }
-int ms_user_get_default_thumb_store_path(uid_t uid, char **path)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       if (uid == getuid()) {
-               const char *result = tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/phone");
-               *path = g_strndup(result, strlen(result));
-       } else {
-               ret = tzplatform_set_user(uid);
-               MSAPI_RETVM_IF(ret != 0, MS_MEDIA_ERR_INTERNAL, "Invalid UID[%d]", uid);
-
-               const char *result = tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/phone");
-               *path = g_strndup(result, strlen(result));
 
-               tzplatform_reset_user();
-       }
-
-       //MSAPI_DBG_SLOG("thumb path [%s]", *path);
-
-       return ret;
-}
-
-int ms_user_get_mmc_thumb_store_path(uid_t uid, char **path)
+int ms_user_get_thumb_store_path(uid_t uid, ms_user_storage_type_e storage_type, char **path)
 {
        int ret = MS_MEDIA_ERR_NONE;
 
        if (uid == getuid()) {
-               const char *result = tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/mmc");
-               *path = g_strndup(result, strlen(result));
+               if (storage_type == MS_USER_STORAGE_INTERNAL)
+                       *path = g_strdup(tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/phone"));
+               else
+                       *path = g_strdup(tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/mmc"));
        } else {
                ret = tzplatform_set_user(uid);
                MSAPI_RETVM_IF(ret != 0, MS_MEDIA_ERR_INTERNAL, "Invalid UID[%d]", uid);
 
-               const char *result = tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/mmc");
-               *path = g_strndup(result, strlen(result));
+               if (storage_type == MS_USER_STORAGE_INTERNAL)
+                       *path = g_strdup(tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/phone"));
+               else
+                       *path = g_strdup(tzplatform_mkpath(TZ_USER_SHARE, "media/.thumb/mmc"));
 
                tzplatform_reset_user();
        }

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 90308f2..e24382c 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.48
+Version:    0.3.49
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0