Code cleanup

1. Reduce defines
2. Exclude TV code.
3. Cleanup headers
4. Remove iniparser related code (The operating environments of scanner-v1 and scanner-v2 are different, so environment variables are unnecessary.)

Change-Id: Ie221610df21bb087dfb34e23ce6e12c3c7a857fe
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 509dc7b..d4fc044 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ COMMON_CFLAGS = -I${srcdir}/lib/include \
                $(GTHREAD_CFLAGS) \
                $(DLOG_CFLAGS) \
                $(SQLITE3_CFLAGS) \
-               $(INIPARSER_CFLAGS) \
                $(LIBPMCONTROL_CFLAGS) \
                $(LIBSYSTEMD_CFLAGS) \
                $(SECURITY_CFLAGS) \
@@ -36,7 +35,6 @@ COMMON_LDADD =        libmedia-utils.la \
                $(GTHREAD_LIBS) \
                $(DLOG_LIBS) \
                $(SQLITE3_LIBS) \
-               $(INIPARSER_LIBS) \
                $(LIBPMCONTROL_LIBS) \
                $(LIBSYSTEMD_LIBS) \
                $(SECURITY_LIBS) \
@@ -101,9 +99,7 @@ endif
 ######################################################
 media_server_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/server/media-server-db-manage.c \
                        src/server/media-server-db.c \
                        src/server/media-server-socket.c \
                        src/server/media-server-scanner.c \
@@ -111,7 +107,9 @@ media_server_SOURCES = src/common/media-common-utils.c \
                        src/server/media-server-main.c
 
 if USE_PRODUCT_TV
-media_server_SOURCES += src/common/media-common-utils-tv.c
+media_server_SOURCES += src/common/media-common-utils-tv.c \
+                      src/common/media-common-external-storage.c \
+                      src/server/media-server-db-manage.c
 endif
 
 media_server_CFLAGS = -I${srcdir}/src/server/include \
@@ -166,15 +164,15 @@ else
 media_scanner_v2_SOURCES = src/common/media-common-utils.c \
                        src/common/media-common-utils-tv.c \
                        src/common/media-common-system.c \
-                        src/common/media-common-external-storage.c \
+                       src/common/media-common-external-storage.c \
                        src/common/media-common-db-svc.c \
                        src/scanner-v2/media-scanner-db-manage-v2.c \
                        src/scanner-v2/media-scanner-common-v2.c \
                        src/scanner-v2/media-scanner-device-block-v2.c\
-                        src/scanner-v2/media-scanner-scan-v2.c \
-                        src/scanner-v2/media-scanner-socket-v2.c \
+                       src/scanner-v2/media-scanner-scan-v2.c \
+                       src/scanner-v2/media-scanner-socket-v2.c \
                        src/scanner-v2/media-scanner-extract-v2.c \
-                        src/scanner-v2/media-scanner-v2.c
+                       src/scanner-v2/media-scanner-v2.c
 
 media_scanner_v2_CFLAGS = -I${srcdir}/src/scanner-v2/include \
                           $(COMMON_CFLAGS)

diff --git a/configure.ac b/configure.ac
index 874d3f3..aec33b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -83,10 +83,6 @@ PKG_CHECK_MODULES(ICUI18N, icu-i18n)
 AC_SUBST(ICUI18N_CFLAGS)
 AC_SUBST(ICUI18N_LIBS)
 
-PKG_CHECK_MODULES(INIPARSER, iniparser)
-AC_SUBST(INIPARSER_CFLAGS)
-AC_SUBST(INIPARSER_LIBS)
-
 #systemd login lib
 PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
 AC_SUBST(LIBSYSTEMD_CFLAGS)

diff --git a/media_content_config.ini b/media_content_config.ini
index c0ca2df..0ddf7e9 100644 (file)
--- a/media_content_config.ini
+++ b/media_content_config.ini
@@ -1,9 +1,4 @@
 [media-content-config]
-;scanner_type
-; 0 = extract all data at once
-; 1 = 2 step scanning
-scanner_type=0
-
 ;ebook_search_type
 ; 0 = direct search
 ; 1 = DB search

diff --git a/media_content_config_product.ini b/media_content_config_product.ini
index 95614b5..3f202d0 100644 (file)
--- a/media_content_config_product.ini
+++ b/media_content_config_product.ini
@@ -1,9 +1,4 @@
 [media-content-config]
-;scanner_type
-; 0 = extract all data at once
-; 1 = 2 step scanning
-scanner_type=1
-
 ;ebook_search_type
 ; 0 = direct search
 ; 1 = DB search

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 674fb6f..03410b0 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -17,7 +17,6 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(icu-i18n)
-BuildRequires:  pkgconfig(iniparser)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(cynara-client)

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 20a16df..08ab7bd 100644 (file)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -34,15 +34,18 @@
 #define MS_VALID 1
 #define MS_INVALID 0
 #define MS_SCANNING 2
+
+#ifdef _USE_TVPD_MODE
 #define MS_VALID_V2 2
 
 #define MS_RECURSIVE 1
 #define MS_NON_RECURSIVE 0
 
-#ifdef _USE_TVPD_MODE
 #define MS_SERVER_STATUS "memory/private/mediaserver/server_status"
 #define MS_DB_LIMIT "file/private/mediaserver/db_limit"
 #define MS_DB_RESET "file/private/mediaserver/db_reset"
+#define MS_MM_CONF_PATH SYSCONFDIR"/multimedia/"
+#define MS_DUMMY_MEDIA_DB_PATH MS_MM_CONF_PATH".media.db"
 #endif
 
 /*Use for Poweroff sequence*/
@@ -57,19 +60,7 @@
 #define MS_SQLITE3_FINALIZE(x)         if (x != NULL) sqlite3_finalize(x);
 #define MS_SQLITE3_SAFE_FREE(x)          {if (x != NULL) {sqlite3_free(x); x = NULL; } }
 
-/*System default folder definition*/
-#define FAT_FILENAME_LEN_MAX           255     /* not inc null */
-#define FAT_FILEPATH_LEN_MAX           4096    /* inc null */
-
-/* The following MACROs(TAF_XXX) are defined in "fs-limit.h"*/
-#define MS_FILE_NAME_LEN_MAX           FAT_FILENAME_LEN_MAX             /**< File name max length on file system */
-#define MS_FILE_PATH_LEN_MAX           FAT_FILEPATH_LEN_MAX             /**< File path max length (include file name) on file system */
-
-#define MS_SOCK_NOT_ALLOCATE -1
-
-#define MS_INI_DEFAULT_PATH SYSCONFDIR"/multimedia/media_content_config.ini"
-#define MS_MM_CONF_PATH SYSCONFDIR"/multimedia/"
-#define MS_DUMMY_MEDIA_DB_PATH MS_MM_CONF_PATH".media.db"
+#define MS_FILE_PATH_LEN_MAX 4096
 
 typedef enum {
        MS_SCAN_INVALID,

diff --git a/src/common/include/media-common-utils.h b/src/common/include/media-common-utils.h
index f26d762..c8aaacb 100644 (file)
--- a/src/common/include/media-common-utils.h
+++ b/src/common/include/media-common-utils.h
@@ -21,10 +21,13 @@
 #ifndef _MEDIA_SERVER_UTILS_H__
 #define _MEDIA_SERVER_UTILS_H__
 
-#include <inttypes.h>
 #include "media-util.h"
 #include "media-common-types.h"
 
+#ifdef _USE_TVPD_MODE
+#include <inttypes.h>
+#endif
+
 bool ms_is_valid_symlink(const char *path);
 int ms_verify_all_parent_dirs(const char *full_path, uid_t uid);
 int ms_check_scan_ignore(char *path, uid_t uid);

diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index 945ccb4..626a7bd 100644 (file)
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -24,11 +24,12 @@
 #include "media-util.h"
 #include "media-common-dbg.h"
 #include "media-common-types.h"
-#include "media-common-external-storage.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"
 
 #ifdef _USE_TVPD_MODE
+#include "media-common-external-storage.h"
+
 static int __ms_sys_subscribe_device_block_event(usb_connected_cb usr_callback, void *usr_data)
 {
        MS_DBG_FENTER();
@@ -128,8 +129,6 @@ void ms_sys_unset_poweroff_cb(void)
 
 #define BLOCK_DEVICE_CHANGED   "DeviceChanged"
 #define BLOCK_DEVICE_METHOD            "GetDeviceList"
-#define BLOCK_DEVICE_USB       "scsi"
-#define BLOCK_DEVICE_MMC       "mmc"
 #define BLOCK_DEVICE_ALL       "all"
 
 static GDBusConnection *g_storage_bus;

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index 877e967..c70b0a4 100644 (file)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -33,7 +33,7 @@
 gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer data)
 {
        ms_comm_msg_s *recv_msg = NULL;
-       int sockfd = MS_SOCK_NOT_ALLOCATE;
+       int sockfd = -1;
        int err = -1;
 
        MS_DBG_RETVM_IF(!src, G_SOURCE_CONTINUE, "src is invalid");

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index 11185f3..f7b4e8a 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -23,7 +23,6 @@
 #include "media-util.h"
 #include "media-server-ipc.h"
 #include "media-common-utils.h"
-#include "media-common-external-storage.h"
 #include "media-common-db-svc.h"
 #include "media-scanner-dbg.h"
 #include "media-scanner-socket.h"

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index 55c5da9..d8c358d 100644 (file)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -31,7 +31,7 @@
 gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer data)
 {
        ms_comm_msg_s *recv_msg = NULL;
-       int sockfd = MS_SOCK_NOT_ALLOCATE;
+       int sockfd = -1;
        int err = -1;
 
        MS_DBG_RETVM_IF(!src, G_SOURCE_CONTINUE, "src is invalid");

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index 7b8c435..e77f54b 100644 (file)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 
 #include "media-common-utils.h"
-#include "media-common-external-storage.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"
 

diff --git a/src/server/media-server-device-block.c b/src/server/media-server-device-block.c
index bc3b136..128225d 100644 (file)
--- a/src/server/media-server-device-block.c
+++ b/src/server/media-server-device-block.c
@@ -18,17 +18,18 @@
  */
 #include "media-util.h"
 #include "media-common-db-svc.h"
-#include "media-common-external-storage.h"
 #include "media-common-system.h"
 
 #include "media-util-err.h"
 #include "media-server-dbg.h"
 #include "media-server-socket.h"
 #include "media-server-scanner.h"
-#include "media-server-db-manage.h"
 #include "media-server-device-block.h"
 
 #ifdef _USE_TVPD_MODE
+#include "media-server-db-manage.h"
+#include "media-common-external-storage.h"
+
 #include <media-util-noti.h>
 #define PROD_CUSTOM_MIME_ADDED   "1"
 #define PROD_CUSTOM_MIME_REMOVED "0"

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index feb7750..ac07a18 100644 (file)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -24,7 +24,6 @@
 
 #include "media-util.h"
 #include "media-common-utils.h"
-#include "media-common-external-storage.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"
 
@@ -33,9 +32,11 @@
 #include "media-server-db.h"
 #include "media-server-scanner.h"
 #include "media-server-device-block.h"
-#include "media-server-db-manage.h"
 
 #ifdef _USE_TVPD_MODE
+#include "media-common-external-storage.h"
+#include "media-server-db-manage.h"
+
 #include <vconf.h>
 
 #define MS_VCONF_KEY_RESET_STATUS "db/media_server/reset_status"

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index d8a6aa4..c8851df 100644 (file)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <iniparser.h>
 
 #include "media-util.h"
 #include "media-server-ipc.h"
@@ -35,9 +34,12 @@
 #ifdef _USE_TVPD_MODE
 #include <vconf.h>
 #define VCONFKEY_PRIVATE_EXTRACTSTATUS "db/private/extractstatus"
-#endif
+#define MEDIA_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-scanner-v2")
+#define MEDIA_SERVER_NAME "media-scanner-v2"
+#else
 #define MEDIA_SERVER_PATH tzplatform_mkpath(TZ_SYS_BIN, "media-scanner")
-#define MEDIA_SERVER_PATH_V2 tzplatform_mkpath(TZ_SYS_BIN, "media-scanner-v2")
+#define MEDIA_SERVER_NAME "media-scanner"
+#endif
 
 extern GMainLoop *mainloop;
 extern GArray *owner_list;
@@ -130,24 +132,6 @@ static gboolean __ms_stop_scanner(gpointer user_data)
        return G_SOURCE_REMOVE;
 }
 
-static int __ms_get_ini_config(const char *key)
-{
-       dictionary *dict = NULL;
-       int value = 0;
-
-       dict = iniparser_load(MS_INI_DEFAULT_PATH);
-       if (!dict) {
-               MS_DBG_ERR("%s load failed", MS_INI_DEFAULT_PATH);
-               return 0;
-       }
-
-       value = iniparser_getint(dict, key, 0);
-
-       iniparser_freedict(dict);
-
-       return value;
-}
-
 void ms_cleanup_scanner(void)
 {
        MS_DBG_WARN("ms_cleanup_scanner START");
@@ -250,11 +234,7 @@ int ms_scanner_start(void)
                /* attach socket receive message callback */
        } else if (pid == 0) {
                /* child process */
-               if (__ms_get_ini_config("media-content-config:scanner_type") == 1)
-                       execl(MEDIA_SERVER_PATH_V2, "media-scanner-v2", NULL);
-               else
-                       execl(MEDIA_SERVER_PATH, "media-scanner", NULL);
-
+               execl(MEDIA_SERVER_PATH, MEDIA_SERVER_NAME, NULL);
                g_mutex_unlock(&scanner_mutex);
        }
 

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 2a75790..0887839 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -29,11 +29,14 @@
 #include "media-common-db-svc.h"
 #include "media-common-system.h"
 #include "media-server-dbg.h"
-#include "media-server-db-manage.h"
 #include "media-server-device-block.h"
 #include "media-server-scanner.h"
 #include "media-server-socket.h"
 
+#ifdef _USE_TVPD_MODE
+#include "media-server-db-manage.h"
+#endif
+
 GArray *owner_list;
 extern GMutex scanner_mutex;
 int ms_req_num;
@@ -195,7 +198,7 @@ gboolean ms_read_socket(GIOChannel *src, GIOCondition condition, gpointer user_d
 {
        ms_comm_msg_s recv_msg;
        ms_comm_msg_s res_msg;
-       int sockfd = MS_SOCK_NOT_ALLOCATE;
+       int sockfd = -1;
        int ret = MS_MEDIA_ERR_NONE;
        int client_sock = -1;
        ms_peer_credentials creds;
@@ -414,7 +417,7 @@ ERROR:
 gboolean ms_receive_message_from_scanner(GIOChannel *src, GIOCondition condition, gpointer data)
 {
        ms_comm_msg_s recv_msg;
-       int fd = MS_SOCK_NOT_ALLOCATE;
+       int fd = -1;
        int err;
 
        fd = g_io_channel_unix_get_fd(src);