Check error of making thumbnail and modify message type sent to thumbnail server

1. Check error message of creating thumbnail pass throug media-server
2. Add enum of the message type between media-server and thumbnail-server
3. Replace hardcoded message type to enum

Change-Id: I0482403b04674402e79bb9f50554fd45769c9a4d
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/lib/include/media-util-err.h b/lib/include/media-util-err.h
index 8753161..b700706 100755 (executable)
--- a/lib/include/media-util-err.h
+++ b/lib/include/media-util-err.h
@@ -79,6 +79,7 @@
 /* Thumbnail error*/
 #define MS_MEDIA_ERR_THUMB_TOO_BIG                             -801    /* Original is too big to make thumb */
 #define MS_MEDIA_ERR_THUMB_DUPLICATED_REQUEST  -802    /* Duplicated request of same path */
+#define MS_MEDIA_ERR_THUMB_UNSUPPORTED                 -803    /* Unsupported content */
 
 /*ETC*/
 #define MS_MEDIA_ERR_VCONF_SET_FAIL                            -901    /* vconf setting fails*/

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index ca7b2c0..d429609 100755 (executable)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -32,6 +32,20 @@ extern "C" {
 
 #include "media-server-ipc.h"
 
+/* IPC message type between media-server & thumbnail-server */
+enum {
+       THUMB_REQUEST_DB_INSERT,
+       THUMB_REQUEST_ALL_MEDIA,
+       THUMB_REQUEST_CANCEL_MEDIA,
+       THUMB_REQUEST_CANCEL_ALL,
+       THUMB_REQUEST_KILL_SERVER,
+       THUMB_RESPONSE,
+       THUMB_REQUEST_RAW_DATA,
+       THUMB_REQUEST_CANCEL_RAW_DATA,
+       THUMB_REQUEST_CANCEL_ALL_RAW_DATA,
+       THUMB_RESPONSE_RAW_DATA,
+};
+
 int ms_ipc_create_client_socket(int timeout_sec, ms_sock_info_s* sock_info);
 int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd);
 int ms_ipc_send_msg_to_server_tcp(int sockfd, ms_msg_port_type_e port, ms_comm_msg_s *send_msg, struct sockaddr_un *serv_addr);

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 7cf15a2..ff6d5f1 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.34
+Version:    0.3.35
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
old mode 100644 (file)
new mode 100755 (executable)
index d5e1cba..fc229fe
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -198,11 +198,11 @@ int _ms_thumb_recv_msg(int sock, thumbMsg *msg)
        }
        memcpy(msg, buf, header_size);
 
-       MS_DBG("origin_path_size : %d, dest_path_size : %d, thumb_size : %d", msg->origin_path_size, msg->dest_path_size, msg->thumb_size);
+       MS_DBG("origin_path_size : %d, dest_path_size : %d, thumb_size : %d, status : %d", msg->origin_path_size, msg->dest_path_size, msg->thumb_size, msg->status);
 
        MS_SAFE_FREE(buf);
 
-       if (msg->msg_type == MS_MSG_THUMB_EXTRACT_ALL_DONE || msg->msg_type == 5) {
+       if (msg->msg_type == MS_MSG_THUMB_EXTRACT_ALL_DONE || msg->msg_type == THUMB_REQUEST_KILL_SERVER) {
                MS_DBG("msg_type only cases [%d]", msg->msg_type);
                return MS_MEDIA_ERR_NONE;
        }
@@ -478,10 +478,14 @@ gboolean _ms_thumb_agent_send_msg_to_thumb_server(thumbMsg *recv_msg, thumbMsg *
                return FALSE;
        }
 
-       MS_DBG_SLOG("recv %s from thumb daemon is successful", res_msg->dst_path);
+       if (res_msg->status == MS_MEDIA_ERR_NONE)
+               MS_DBG_SLOG("recv %s from thumb daemon is successful", res_msg->dst_path);
+       else
+               MS_DBG_SLOG("recv %s from thumb daemon is failed (%d)", res_msg->dst_path, res_msg->status);
+
        ms_ipc_delete_client_socket(&sock_info);
 
-       if (res_msg->msg_type == 2 && g_communicate_sock > 0) { // THUMB_REQUEST_ALL_MEDIA
+       if (res_msg->msg_type == THUMB_REQUEST_ALL_MEDIA && g_communicate_sock > 0) {
                GSource *source = NULL;
                if (g_tcp_channel == NULL)
                        g_tcp_channel = g_io_channel_unix_new(g_communicate_sock);
@@ -508,7 +512,7 @@ gboolean _ms_thumb_check_queued_request(gpointer data)
                memset((void *)&msg, 0, sizeof(msg));
                memset((void *)&recv_msg, 0, sizeof(recv_msg));
 
-               msg.msg_type = 2; // THUMB_REQUEST_ALL_MEDIA
+               msg.msg_type = THUMB_REQUEST_ALL_MEDIA;
                msg.org_path[0] = '\0';
                msg.origin_path_size = 1;
                msg.dst_path[0] = '\0';
@@ -548,7 +552,7 @@ gboolean _ms_thumb_agent_timer()
                memset((void *)&msg, 0, sizeof(msg));
                memset((void *)&recv_msg, 0, sizeof(recv_msg));
 
-               msg.msg_type = 5; // THUMB_REQUEST_KILL_SERVER
+               msg.msg_type = THUMB_REQUEST_KILL_SERVER;
                msg.org_path[0] = '\0';
                msg.origin_path_size = 1;
                msg.dst_path[0] = '\0';
@@ -630,7 +634,7 @@ gboolean _ms_thumb_request_to_server(gpointer data)
        }
 
        if (recv_msg) {
-               if (recv_msg->msg_type == 2 && g_thumb_server_extracting) { // THUMB_REQUEST_ALL_MEDIA
+               if (recv_msg->msg_type == THUMB_REQUEST_ALL_MEDIA && g_thumb_server_extracting) {
                        MS_DBG_WARN("Thumbnail server is already extracting..This request is queued.");
                        g_thumb_server_queued_all_extracting_request = TRUE;
                } else {
@@ -640,8 +644,8 @@ gboolean _ms_thumb_request_to_server(gpointer data)
                                thumbMsg res_msg;
                                memset((void *)&res_msg, 0, sizeof(res_msg));
 
-                               res_msg.msg_type = 6; // THUMB_RESPONSE
-                               res_msg.status = 1; //THUMB_FAIL
+                               res_msg.msg_type = THUMB_RESPONSE;
+                               res_msg.status = MS_MEDIA_ERR_INTERNAL;
                                res_msg.origin_path_size = strlen(recv_msg->org_path);
                                strncpy(res_msg.org_path, recv_msg->org_path, res_msg.origin_path_size);
                                res_msg.dst_path[0] = '\0';
@@ -783,8 +787,8 @@ gboolean _ms_thumb_agent_read_socket(GIOChannel *src,
                thumbMsg res_msg;
                memset((void *)&res_msg, 0, sizeof(res_msg));
 
-               res_msg.msg_type = 6; // THUMB_RESPONSE
-               res_msg.status = 1; //THUMB_FAIL
+               res_msg.msg_type = THUMB_RESPONSE;
+               res_msg.status = MS_MEDIA_ERR_INTERNAL;
                res_msg.origin_path_size = recv_msg->origin_path_size;
                strncpy(res_msg.org_path, recv_msg->org_path, res_msg.origin_path_size);
                res_msg.dst_path[0] = '\0';