Add function for invalid storage

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

diff --git a/src/include/util/media-thumb-db.h b/src/include/util/media-thumb-db.h
index 146ebf2f2e1410b71e2209144c84e9c0c53e2832..e7768e15e0aaf044561a367dcabf9571fc8d2ff1 100755 (executable)
--- a/src/include/util/media-thumb-db.h
+++ b/src/include/util/media-thumb-db.h
@@ -35,6 +35,7 @@
 
 int _media_thumb_get_thumb_from_db(const char *origin_path, char *thumb_path, int max_length, uid_t uid);
 int _media_thumb_update_db(const char *origin_path, char *thumb_path, uid_t uid);
+int _media_thumb_get_storage_id_from_db(const char *origin_path, char **storage_id, uid_t uid);
 
 #endif /*_MEDIA_THUMB_DB_H_*/
 

diff --git a/src/media-thumb-internal.c b/src/media-thumb-internal.c
index 63aeb11e5ad996b27ee31987ea2eed177173f7de..44b9d887c2767111cf2b749f9410ddc99843615b 100755 (executable)
--- a/src/media-thumb-internal.c
+++ b/src/media-thumb-internal.c
@@ -23,6 +23,7 @@
 #include "media-thumb-util.h"
 #include "media-thumb-internal.h"
 #include "media-thumb-ipc.h"
+#include "media-thumb-db.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -331,6 +332,7 @@ int _media_thumb_get_hash_name(const char *file_full_path, char *thumb_hash_path
        char *hash_name = NULL;
        char file_ext[255] = { 0 };
        char *get_path = NULL;
+       char *storage_id = NULL;
        int ret_len = 0;
        ms_user_storage_type_e storage_type = -1;
        int ret = MS_MEDIA_ERR_NONE;
@@ -353,8 +355,14 @@ int _media_thumb_get_hash_name(const char *file_full_path, char *thumb_hash_path
                thumb_err("_media_thumb_generate_hash_name fail");
                return MS_MEDIA_ERR_INTERNAL;
        }
+       ret = _media_thumb_get_storage_id_from_db(file_full_path, &storage_id, uid);
+       if (ret != MS_MEDIA_ERR_NONE) {
+               thumb_err("_media_thumb_get_storage_id_from_db fail");
+               return MS_MEDIA_ERR_INTERNAL;
+       }
 
-       ret = ms_user_get_thumb_store_path(uid, storage_type, &get_path);
+       ret = ms_user_get_thumb_store_path(uid, storage_type, storage_id, &get_path);
+       SAFE_FREE(storage_id);
        if (get_path != NULL)
                ret_len = snprintf(thumb_hash_path, max_thumb_path - 1, "%s/.%s-%s.jpg", get_path, file_ext, hash_name);
 

diff --git a/src/util/media-thumb-db.c b/src/util/media-thumb-db.c
index 3431df2eb7045054213635590a73b1b5de6a666e..3326fb31aae5651b868804560d61c03ddd18f4e5 100755 (executable)
--- a/src/util/media-thumb-db.c
+++ b/src/util/media-thumb-db.c
@@ -144,3 +144,12 @@ int _media_thumb_update_db(const char *origin_path, char *thumb_path, uid_t uid)
        return err;
 }
 
+int _media_thumb_get_storage_id_from_db(const char *origin_path, char **storage_id, uid_t uid)
+{
+       int err = MS_MEDIA_ERR_NONE;
+       thumb_retvm_if(!STRING_VALID(origin_path), MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid origin_path");
+
+       err = __media_thumb_get_storage_id(origin_path, uid, storage_id);
+
+       return err;
+}
\ No newline at end of file