Code cleanup

Remove unused APIs, values, structures, and etc.

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

diff --git a/Makefile.am b/Makefile.am
index 976ffc5..7f60cc9 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,7 +150,6 @@ media_scanner_SOURCES = src/common/media-common-utils.c \
                        src/common/media-common-system.c \
                        src/common/media-common-external-storage.c \
                        src/common/media-common-db-svc.c \
-                       src/scanner/media-scanner-db-manage.c \
                         src/scanner/media-scanner-device-block.c \
                        src/scanner/media-scanner-scan.c \
                        src/scanner/media-scanner-socket.c \

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index e24382c..4567905 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.49
+Version:    0.3.50
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/include/media-common-system.h b/src/common/include/media-common-system.h
index b601b8a..6d8a531 100755 (executable)
--- a/src/common/include/media-common-system.h
+++ b/src/common/include/media-common-system.h
@@ -74,6 +74,4 @@ int ms_sys_set_poweroff_cb(device_changed_cb user_callback, void *user_data);
 int ms_sys_unset_poweroff_cb(void);
 
 int ms_sys_get_uid(uid_t *uid);
-
-
 #endif

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 081b000..b0ae677 100755 (executable)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -99,32 +99,6 @@ typedef enum {
        MS_DB_STOPPED = 2
 } ms_db_status_type_t;
 
-typedef struct ms_dir_scan_info {
-       char *name;
-       struct ms_dir_scan_info *parent;
-       struct ms_dir_scan_info *Rbrother;
-       struct ms_dir_scan_info *next;
-} ms_dir_scan_info;
-
-typedef struct {
-       char *path;
-       ms_storage_type_t storage_type;
-       ms_dir_scan_type_t scan_type;
-       int pid;
-       bool recursive_on;
-} ms_scan_data_t;
-
-typedef struct {
-       char *path;
-       int pid;
-} ms_register_data_t;
-
-typedef struct ms_otg_data {
-       char *path;
-       char *device_id;
-//     ms_otg_scan_status status;
-} ms_otg_data;
-
 /*use for MS_SCANNER_STATUS */
 typedef enum {
        MS_STORAGE_SCAN_NONE,                   /**< Media Scanner not detect storage yet*/
@@ -145,34 +119,20 @@ typedef enum {
        MS_DIR_SCAN_STOP                                = 3,                    /**< Stop scanning storage*/
        MS_DIR_SCAN_DONE                                = 4,                    /**< Scanning Done but need to extract metadata*/
        MS_DIR_SCAN_META_PROCESSING     = 5,                    /**< Scanning Done and start to extract metadata*/
-       MS_DIR_SCAN_META_STOP           = 6,                    /**< Stop extract metadata*/
+       MS_DIR_SCAN_META_STOP                   = 6,                    /**< Stop extract metadata*/
        MS_DIR_SCAN_COMPLETE                    = 7,                    /**< Complete scanning*/
 } ms_dir_scan_status_e;
 
-#if 0
-typedef enum {
-       MEDIA_SCAN_PREPARE              = 0,    /**< Prepare scanning*/
-       MEDIA_SCAN_PROCESSING   = 1,    /**< Process scanning*/
-       MEDIA_SCAN_STOP                 = 2,    /**< Stop scanning*/
-       MEDIA_SCAN_COMPLETE             = 3,    /**< Complete scanning*/
-       MEDIA_SCAN_MAX                  = 4,    /**< Invalid status*/
-       MEDIA_EXTRACT_PREPARE           = 5,    /**< Prepare extract*/
-       MEDIA_EXTRACT_PROCESSING        = 6,    /**< Process extract*/
-       MEDIA_EXTRACT_STOP                      = 7,    /**< Stop extract*/
-       MEDIA_EXTRACT_COMPLETE          = 8             /**< Complete extract*/
-} media_scan_status_e;
-#else
 typedef enum {
        MEDIA_SCAN_PREPARE              = 0,    /**< Prepare scanning*/
-       MEDIA_SCAN_PROCESSING   = 1,    /**< Process scanning*/
+       MEDIA_SCAN_PROCESSING           = 1,    /**< Process scanning*/
        MEDIA_SCAN_STOP                 = 2,    /**< Stop scanning*/
        MEDIA_SCAN_COMPLETE             = 3,    /**< Complete scanning*/
        MEDIA_EXTRACT_PREPARE           = 4,    /**< Prepare extract*/
        MEDIA_EXTRACT_PROCESSING        = 5,    /**< Process extract*/
        MEDIA_EXTRACT_STOP                      = 6,    /**< Stop extract*/
-       MEDIA_EXTRACT_COMPLETE          = 7             /**< Complete extract*/
+       MEDIA_EXTRACT_COMPLETE  = 7             /**< Complete extract*/
 } media_scan_status_e;
-#endif
 
 typedef enum {
        MS_MEDIA_TYPE_IMAGE     = 0,    /**< Image Content*/
@@ -180,8 +140,8 @@ typedef enum {
        MS_MEDIA_TYPE_SOUND     = 2,    /**< Sound Content like Ringtone*/
        MS_MEDIA_TYPE_MUSIC     = 3,    /**< Music Content like mp3*/
        MS_MEDIA_TYPE_OTHER     = 4,    /**< Not media Content*/
-       MS_MEDIA_TYPE_PVR       = 5,    /**< PVR Content*/
-       MS_MEDIA_TYPE_UHD       = 6,    /**< UHD Content*/
+       MS_MEDIA_TYPE_PVR               = 5,    /**< PVR Content*/
+       MS_MEDIA_TYPE_UHD               = 6,    /**< UHD Content*/
        MS_SVC_MEDIA_TYPE_SCSA  = 7,    /**< SCSA Content*/
 } ms_media_type_e;
 

diff --git a/src/common/include/media-common-utils.h b/src/common/include/media-common-utils.h
index 73593b1..bd93fe3 100755 (executable)
--- a/src/common/include/media-common-utils.h
+++ b/src/common/include/media-common-utils.h
@@ -25,13 +25,7 @@
 
 #include "media-common-types.h"
 
-int ms_db_init(bool need_db_create);
-bool ms_is_mmc_inserted(void);
-void ms_usb_vconf_cb(void *data);
-int ms_start(bool need_db_create);
-void ms_end(void);
 int ms_strappend(char *res, const int size, const char *pattern, const char *str1, const char *str2);
-int ms_strcopy(char *res, const int size, const char *pattern, const char *str1);
 bool ms_config_get_int(const char *key, int *value);
 bool ms_config_set_int(const char *key, int value);
 bool ms_config_get_str(const char *key, char **value);

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 293122a..acabd26 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -87,12 +87,6 @@ void ms_make_default_path_mmc(const char *mount_path)
                        if (ret != 0) {
                                MS_DBG_STRERROR("chmod failed");
                        }
-                       /*
-                       ret = chown(default_path[i], 5000, 5000);
-                       if (ret != 0) {
-                               MS_DBG_STRERROR("chown failed");
-                       }
-                       */
                } else {
                        closedir(dp);
                }
@@ -214,7 +208,7 @@ int ms_read_device_info(const char *root_path, char **device_uuid)
 
        ret = __ms_check_mount_path(root_path);
        if (ret != MS_MEDIA_ERR_NONE) {
-               MS_DBG_ERR("ms_strappend falied");
+               MS_DBG_ERR("__ms_check_mount_path falied");
                goto ERROR;
        }
 

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index db16aef..6a84597 100755 (executable)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -47,8 +47,6 @@
 #include "media-common-system.h"
 #include "media-common-utils.h"
 
-#define MS_DRM_CONTENT_TYPE_LENGTH 100
-
 /* it's for 32bit file offset */
 struct statvfs_32 {
        unsigned long int f_bsize;
@@ -68,28 +66,6 @@ struct statvfs_32 {
        int __f_spare[6];
 };
 
-bool ms_is_mmc_inserted(void)
-{
-       bool ret = FALSE;
-       ms_stg_type_e stg_type = MS_STG_TYPE_MMC;
-       GArray *dev_list = NULL;
-
-       ret = ms_sys_get_device_list(stg_type, &dev_list);
-       if (ret == MS_MEDIA_ERR_NONE) {
-               if (dev_list != NULL) {
-                       MS_DBG_WARN("MMC FOUND[%d]", dev_list->len);
-                       ms_sys_release_device_list(&dev_list);
-                       ret = TRUE;
-               } else {
-                       MS_DBG_ERR("MMC NOT FOUND");
-               }
-       } else {
-               MS_DBG_ERR("ms_sys_get_device_list failed");
-       }
-
-       return ret;
-}
-
 int ms_strappend(char *res, const int size, const char *pattern, const char *str1, const char *str2)
 {
        int len = 0;
@@ -111,32 +87,6 @@ int ms_strappend(char *res, const int size, const char *pattern, const char *str
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_strcopy(char *res, const int size, const char *pattern, const char *str1)
-{
-       int len = 0;
-       int real_size = size;
-
-       if (!res || !pattern || !str1) {
-               MS_DBG_ERR("parameta is invalid");
-               return MS_MEDIA_ERR_INVALID_PARAMETER;
-       }
-
-       if (real_size < (int)(strlen(str1))) {
-               MS_DBG_ERR("size is wrong");
-               return MS_MEDIA_ERR_INVALID_PARAMETER;
-       }
-
-       len = snprintf(res, real_size, pattern, str1);
-       if (len < 0) {
-               MS_DBG_ERR("snprintf failed");
-               return MS_MEDIA_ERR_INVALID_PARAMETER;
-       }
-
-       res[len] = '\0';
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 bool ms_config_get_int(const char *key, int *value)
 {
        int err;

diff --git a/src/scanner-v2/include/media-scanner-common-v2.h b/src/scanner-v2/include/media-scanner-common-v2.h
index 63eeecd..ff5303f 100644 (file)
--- a/src/scanner-v2/include/media-scanner-common-v2.h
+++ b/src/scanner-v2/include/media-scanner-common-v2.h
@@ -25,8 +25,6 @@
 #include "stdbool.h"
 #include "media-common-system.h"
 
-int msc_set_mmc_status(ms_stg_status_e status);
-int msc_get_mmc_status(ms_stg_status_e *status);
 int msc_set_power_status(bool status);
 int msc_get_power_status(bool *status);
 int msc_set_disc_stg_scan_status(bool status);

diff --git a/src/scanner-v2/media-scanner-common-v2.c b/src/scanner-v2/media-scanner-common-v2.c
index c075a9c..bead771 100644 (file)
--- a/src/scanner-v2/media-scanner-common-v2.c
+++ b/src/scanner-v2/media-scanner-common-v2.c
@@ -23,25 +23,10 @@
 #include "media-scanner-dbg-v2.h"
 #include "media-scanner-common-v2.h"
 
-int mmc_state2 = 0;
 bool power_off2;
 bool disc_stg_scan_status;
 bool disc_dir_scan_status;
 
-int msc_set_mmc_status(ms_stg_status_e status)
-{
-       mmc_state2 = status;
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-int msc_get_mmc_status(ms_stg_status_e *status)
-{
-       *status = mmc_state2;
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 int msc_set_power_status(bool status)
 {
        power_off2 = status;

diff --git a/src/scanner-v2/media-scanner-device-block-v2.c b/src/scanner-v2/media-scanner-device-block-v2.c
index 34b5da8..b2e4911 100755 (executable)
--- a/src/scanner-v2/media-scanner-device-block-v2.c
+++ b/src/scanner-v2/media-scanner-device-block-v2.c
@@ -97,7 +97,6 @@ void _msc_mmc_changed_event(const char *mount_path, ms_stg_status_e mount_status
        if (mount_status == MS_STG_INSERTED) {
                /*DO NOT THING*/
        } else if (mount_status == MS_STG_REMOVED) {
-               msc_set_mmc_status(MS_STG_REMOVED);
                msc_mmc_remove_handler(mount_path);
        }
 

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 4eb3b0b..9bd5c09 100755 (executable)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -45,8 +45,6 @@
 
 #define MSC_VCONF_KEY_SCANNER_POWEROFF_STATUS "db/mediascanner/poweroff_status"
 
-extern int mmc_state2;
-
 extern GAsyncQueue *storage_queue2;
 extern GAsyncQueue *scan_queue2;
 extern GAsyncQueue *reg_queue2;
@@ -129,21 +127,6 @@ static void _power_off_cb(void* data)
 }
 #endif
 
-void _msc_mmc_vconf_cb(void *data)
-{
-       int status = 0;
-
-       if (!ms_config_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &status)) {
-               MS_DBG_ERR("Get VCONFKEY_SYSMAN_MMC_STATUS failed.");
-       }
-
-       MS_DBG_INFO("VCONFKEY_SYSMAN_MMC_STATUS :%d", status);
-
-       mmc_state2 = status;
-
-       return;
-}
-
 #ifdef _USE_SENIOR_MODE
 extern GAsyncQueue *storage_queue2;
 extern GAsyncQueue *storage_extract_queue;
@@ -299,9 +282,6 @@ int main(int argc, char **argv)
        storage_extract_thread = g_thread_new("storage_extract_thread", (GThreadFunc)msc_storage_extract_thread, NULL);
        folder_extract_thread = g_thread_new("folder_extract_thread", (GThreadFunc)msc_folder_extract_thread, NULL);
 
-       if (_USE_SDCARD && ms_is_mmc_inserted()) {
-               msc_set_mmc_status(MS_STG_INSERTED);
-       }
        MS_DBG_INFO("scanner v2 is ready");
 
        msc_send_ready();

diff --git a/src/scanner/include/media-scanner-db-manage.h b/src/scanner/include/media-scanner-db-manage.h
deleted file mode 100755 (executable)
index 5c6ae8d..0000000
--- a/src/scanner/include/media-scanner-db-manage.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*\r
- *  Media Server\r
- *\r
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Yong Yeon Kim <yy9875.kim@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-#ifndef _MEDIA_SCANNER_DB_MANAGER_H__\r
-#define _MEDIA_SCANNER_DB_MANAGER_H__\r
-\r
-#include "media-common-types.h"\r
-\r
-int msc_check_db_size(uid_t uid, int scan_type);\r
-\r
-#endif\r
-\r

diff --git a/src/scanner/include/media-scanner-scan.h b/src/scanner/include/media-scanner-scan.h
index 408720a..f3876bc 100755 (executable)
--- a/src/scanner/include/media-scanner-scan.h
+++ b/src/scanner/include/media-scanner-scan.h
@@ -43,7 +43,6 @@ int msc_del_blocked_path(void);
 void msc_metadata_update_thread(ms_comm_msg_s *recv_msg);
 int msc_init_scanner(void);
 int msc_deinit_scanner(void);
-int msc_set_mmc_status(ms_stg_status_e status);
 int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg);
 int msc_send_power_off_request(void);
 int msc_remove_dir_scan_request(ms_comm_msg_s *recv_msg);

diff --git a/src/scanner/media-scanner-db-manage.c b/src/scanner/media-scanner-db-manage.c
deleted file mode 100755 (executable)
index bfc97ea..0000000
--- a/src/scanner/media-scanner-db-manage.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*\r
- *  Media Server\r
- *\r
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
- *\r
- * Contact: Yong Yeon Kim <yy9875.kim@samsung.com>\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-#include <errno.h>\r
-#include <vconf.h>\r
-#include <aul/aul.h>\r
-#include <sys/statvfs.h>\r
-#include <sys/stat.h>\r
-#include <errno.h>\r
-\r
-#include "media-util.h"\r
-#include "media-common-db-svc.h"\r
-#include "media-common-utils.h"\r
-#include "media-scanner-dbg.h"\r
-#include "media-scanner-db-manage.h"\r
-\r
-int msc_check_db_size(uid_t uid, int scan_type)\r
-{\r
-       double db_size = 0.0;\r
-       double free_space = 0.0;\r
-       int err = MS_MEDIA_ERR_NONE;\r
-\r
-//     ms_check_dbsize(&db_size);\r
-\r
-       if (scan_type == MS_MSG_STORAGE_ALL\r
-               || scan_type == MS_MSG_STORAGE_PARTIAL) {\r
-               if (db_size >= MEDIA_DB_SIZE_LIMIT_1) {\r
-                       MS_DBG_ERR("DB SIZE [%lf] reach the MEDIA_DB_SIZE_LIMIT_1[%lf]", db_size, MEDIA_DB_SIZE_LIMIT_1);\r
-                       return MS_MEDIA_ERR_DB_LIMIT_1;\r
-               }\r
-       } else if (scan_type == MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE\r
-               || scan_type == MS_MSG_DIRECTORY_SCANNING) {\r
-               if (db_size >= MEDIA_DB_SIZE_LIMIT_2) {\r
-                       MS_DBG_ERR("DB SIZE [%lf] reach the MEDIA_DB_SIZE_LIMIT_2[%lf]", db_size, MEDIA_DB_SIZE_LIMIT_2);\r
-                       ms_config_set_int(MS_DB_LIMIT, 0);\r
-                       return MS_MEDIA_ERR_DB_FULL_FAIL;\r
-               }\r
-       }\r
-\r
-       /*check remain space*/\r
-       err = ms_get_remain_space(&free_space);\r
-       if (err != MS_MEDIA_ERR_NONE) {\r
-               MS_DBG_ERR("ms_get_remain_space failed");\r
-       } else {\r
-               if (free_space < MEDIA_DB_SPACE_LIMIT) {\r
-                       MS_DBG_ERR("FREE SPACE [%lf] DB SIZE [%lf]", free_space, db_size);\r
-                       return MS_MEDIA_ERR_NOT_ENOUGH_SPACE;\r
-               }\r
-       }\r
-\r
-       return MS_MEDIA_ERR_NONE;\r
-}\r
-\r
-\r

diff --git a/src/scanner/media-scanner-device-block.c b/src/scanner/media-scanner-device-block.c
index a3ddebe..5ac258c 100755 (executable)
--- a/src/scanner/media-scanner-device-block.c
+++ b/src/scanner/media-scanner-device-block.c
@@ -52,7 +52,6 @@ void _msc_mmc_changed_event(const char *mount_path, ms_stg_status_e mount_status
        if (mount_status == MS_STG_INSERTED) {
                /*DO NOT THING*/
        } else if (mount_status == MS_STG_REMOVED) {
-               msc_set_mmc_status(MS_STG_REMOVED);
                msc_mmc_remove_handler(mount_path);
        }
 

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index a78a81c..7a73442 100755 (executable)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -43,7 +43,6 @@ typedef struct msc_scan_data {
        struct msc_scan_data *next;
 } msc_scan_data;
 
-int mmc_state = 0;
 bool power_off;
 GAsyncQueue * storage_queue;
 GAsyncQueue *scan_queue;
@@ -111,13 +110,6 @@ static int __msc_check_stop_status(ms_storage_type_t storage_type)
                ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP;
        }
 
-       /*check SD card in out */
-#if 0
-       if ((mmc_state != MS_STG_INSERTED) && (storage_type == MS_STORAGE_EXTERNAL)) {
-               MS_DBG_ERR("Directory scanning is stopped");
-               ret = MS_MEDIA_ERR_SCANNER_FORCE_STOP;
-       }
-#endif
        return ret;
 }
 
@@ -1519,13 +1511,6 @@ int msc_deinit_scanner(void)
        return MS_MEDIA_ERR_NONE;
 }
 
-int msc_set_mmc_status(ms_stg_status_e status)
-{
-       mmc_state = status;
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 int msc_push_scan_request(ms_scan_type_e scan_type, ms_comm_msg_s *recv_msg)
 {
        int ret = MS_MEDIA_ERR_NONE;

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index 59e3785..1611a81 100755 (executable)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -110,9 +110,6 @@ int main(int argc, char **argv)
        scan_thread = g_thread_new("scanner_thread", (GThreadFunc)msc_directory_scan_thread, NULL);
        register_thread = g_thread_new("register_thread", (GThreadFunc)msc_register_thread, NULL);
 
-       if (_USE_SDCARD && ms_is_mmc_inserted()) {
-               msc_set_mmc_status(MS_STG_INSERTED);
-       }
        MS_DBG_INFO("scanner is ready");
 
        msc_send_ready();