Remove db space for ebook

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

diff --git a/30_media-server-add.post b/30_media-server-add.post
index c6bd1c6336cace512cf64d10fd840aa66c1ff1d5..076bd6fdcf3304f207369466d920d203373ddfcd 100644 (file)
--- a/30_media-server-add.post
+++ b/30_media-server-add.post
@@ -4,7 +4,6 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 NEW_USER=$1
 export `tzplatform-get --user $NEW_USER TZ_USER_SHARE`
 export `tzplatform-get --user $NEW_USER TZ_USER_DB`
-export `tzplatform-get --user $NEW_USER TZ_SYS_USER_GROUP`
 
 if [ ! -e /system-update ]
 then
@@ -19,9 +18,4 @@ then
 /usr/bin/chmod 0775 $TZ_USER_SHARE/media
 /usr/bin/chmod -R 0777 $TZ_USER_SHARE/media/.thumb
 /usr/bin/find $TZ_USER_SHARE/media/.thumb -type d -exec /usr/bin/chsmack -a 'User::App::Shared' -t {} +
-
-/usr/bin/mkdir $TZ_USER_SHARE/media/.ebook
-/usr/bin/chown $NEW_USER:$TZ_SYS_USER_GROUP $TZ_USER_SHARE/media/.ebook
-/usr/bin/chmod 0775 $TZ_USER_SHARE/media/.ebook
-/usr/bin/chsmack -a 'User::App::Shared' -t $TZ_USER_SHARE/media/.ebook
 fi

diff --git a/lib/include/media-util-user.h b/lib/include/media-util-user.h
index 035a6eb65cd2c62595ccc0e979d85902896dd4dd..237e0f9dafdd2ec90f7d92dc8599765e450cc3fc 100644 (file)
--- a/lib/include/media-util-user.h
+++ b/lib/include/media-util-user.h
@@ -36,7 +36,6 @@ bool ms_user_is_valid_path(uid_t uid, const char *path);
 bool ms_user_thumb_support(uid_t uid, const char *path);
 int ms_user_get_root_thumb_store_path(uid_t uid, char **path);
 int ms_user_get_media_db_path(uid_t uid, char **path);
-int ms_user_get_wordbook_db_path(uid_t uid, char **path);
 
 #ifndef _USE_TVPD_MODE
 int ms_user_get_mediashared_path(uid_t uid, char **path);

diff --git a/lib/media-util-user.c b/lib/media-util-user.c
index 917cf638a5d548e961fb936709b2e285bea73124..840cead411bad747257d72dccedfde1554ce0603 100644 (file)
--- a/lib/media-util-user.c
+++ b/lib/media-util-user.c
@@ -33,7 +33,6 @@ typedef enum {
        MEDIA_DB = 0,
        INTERNAL_ROOT,
        THUMB_ROOT,
-       WORDBOOK_DB,
        MEDIA_SHARED,
 #ifdef _USE_TVPD_MODE
        AOT_CONTENT,
@@ -74,9 +73,6 @@ static int __ms_user_get_path(ms_user_path_type_e type, uid_t uid, char **path)
        case THUMB_ROOT:
                result = tzplatform_context_mkpath(context[idx], TZ_USER_SHARE, "media/.thumb");
                break;
-       case WORDBOOK_DB:
-               result = tzplatform_context_mkpath(context[idx], TZ_USER_SHARE, "media/.ebook/.wordbook.db");
-               break;
 #ifndef _USE_TVPD_MODE
        case MEDIA_SHARED:
                result = tzplatform_context_getenv(context[idx], TZ_USER_MEDIASHARED);
@@ -189,16 +185,6 @@ int ms_user_get_media_db_path(uid_t uid, char **path)
        return MS_MEDIA_ERR_NONE;
 }
 
-int ms_user_get_wordbook_db_path(uid_t uid, char **path)
-{
-       if (uid != getuid())
-               return __ms_user_get_path(WORDBOOK_DB, uid, path);
-
-       *path = g_strdup(tzplatform_mkpath(TZ_USER_SHARE, "media/.ebook/.wordbook.db"));
-
-       return MS_MEDIA_ERR_NONE;
-}
-
 #ifndef _USE_TVPD_MODE
 int ms_user_get_mediashared_path(uid_t uid, char **path)
 {

diff --git a/media_content_config.ini b/media_content_config.ini
deleted file mode 100644 (file)
index 0ddf7e9..0000000
--- a/media_content_config.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[media-content-config]
-;ebook_search_type
-; 0 = direct search
-; 1 = DB search
-ebook_search_type=1

diff --git a/media_content_config_product.ini b/media_content_config_product.ini
deleted file mode 100644 (file)
index 3f202d0..0000000
--- a/media_content_config_product.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[media-content-config]
-;ebook_search_type
-; 0 = direct search
-; 1 = DB search
-ebook_search_type=0

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 2ac509cf9ba3de6a6331bf0380caa6afeadd5357..5e614a9b54ed6decaade1e647b40f36a96bfa15a 100644 (file)
--- 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.6.13
+Version:    0.6.14
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
@@ -139,11 +139,6 @@ ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/me
 
 #ini file
 mkdir -p %{buildroot}/etc/multimedia
-%if 0%{?product_tv}
-cp -rf %{_builddir}/%{name}-%{version}/media_content_config_product.ini %{buildroot}/etc/multimedia/media_content_config.ini
-%else
-cp -rf %{_builddir}/%{name}-%{version}/media_content_config.ini %{buildroot}/etc/multimedia/media_content_config.ini
-%endif
 mkdir -p %{buildroot}/etc/gumd/useradd.d
 cp -rf %{_builddir}/%{name}-%{version}/30_media-server-add.post %{buildroot}/etc/gumd/useradd.d/30_media-server-add.post
 #dummy db file for reset media DB
@@ -189,7 +184,6 @@ chmod 755 /etc/gumd/useradd.d/30_media-server-add.post
 /etc/multimedia/.media.db
 %{_datadir}/upgrade/vd_scripts/additional_scripts/media-server.sh
 %endif
-/etc/multimedia/media_content_config.ini
 /etc/gumd/useradd.d/30_media-server-add.post
 %license LICENSE.APLv2.0
 %{upgrade_script_path}/500.media_db_upgrade.sh