Change content folder name

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

diff --git a/lib/media-util-noti-internal.c b/lib/media-util-noti-internal.c
index 7465740..5527997 100755 (executable)
--- a/lib/media-util-noti-internal.c
+++ b/lib/media-util-noti-internal.c
@@ -80,8 +80,8 @@ int media_db_update_send_internal(int pid, /* mandatory */
 #ifndef _USE_SENIOR_MODE
        /* Need uid to change path */
        if (strncmp(path, "/opt/usr/home", strlen("/opt/usr/home")) == 0) {
-               tmp_path = strstr(path, "content");
-               snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen("content"));
+               tmp_path = strstr(path, MEDIA_CONTENT_PATH);
+               snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen(MEDIA_CONTENT_PATH));
        } else {
                snprintf(repl_path, sizeof(repl_path), "%s", path);
        }

diff --git a/lib/media-util-noti.c b/lib/media-util-noti.c
index e74eb75..36def56 100755 (executable)
--- a/lib/media-util-noti.c
+++ b/lib/media-util-noti.c
@@ -220,8 +220,8 @@ int media_db_update_send(int pid, /* mandatory */
 #ifndef _USE_SENIOR_MODE
        /* Need uid to change path */
        if (strncmp(path, "/opt/usr/home", strlen("/opt/usr/home")) == 0) {
-               tmp_path = strstr(path, "content");
-               snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen("content"));
+               tmp_path = strstr(path, MEDIA_CONTENT_PATH);
+               snprintf(repl_path, sizeof(repl_path), "%s%s", old_path, tmp_path + strlen(MEDIA_CONTENT_PATH));
        } else {
                snprintf(repl_path, sizeof(repl_path), "%s", path);
        }

diff --git a/packaging/media-server.upgrade.sh b/packaging/media-server.upgrade.sh
index 582bcaf..9a28dfb 100644 (file)
--- a/packaging/media-server.upgrade.sh
+++ b/packaging/media-server.upgrade.sh
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 DB_DIR_24=/opt/usr/dbspace
 DB_DIR_30=/opt/usr/home/owner/.applications/dbspace
 MEDIA_DIR_24=/opt/usr/media
-MEDIA_DIR_30=/opt/usr/home/owner/content
+MEDIA_DIR_30=/opt/usr/home/owner/media
 SHARE_DIR_24=/opt/usr/share
 SHARE_DIR_30=/opt/usr/home/owner/share
 
@@ -17,8 +17,8 @@ mv $DB_FILE_24 $DB_FILE_30
 rm -f $DB_FILE_24-journal
 
 # DB update
-sqlite3 $DB_FILE_30 "UPDATE media SET path = replace( path, '/opt/usr/media', '/opt/usr/home/owner/content' ), thumbnail_path = NULL WHERE path LIKE '/opt/usr/media/%';
-UPDATE folder SET path = replace( path, '/opt/usr/media', '/opt/usr/home/owner/content' ) WHERE path LIKE '/opt/usr/media/%' OR path = '/opt/usr/media';
+sqlite3 $DB_FILE_30 "UPDATE media SET path = replace( path, '/opt/usr/media', '/opt/usr/home/owner/media' ), thumbnail_path = NULL WHERE path LIKE '/opt/usr/media/%';
+UPDATE folder SET path = replace( path, '/opt/usr/media', '/opt/usr/home/owner/media' ) WHERE path LIKE '/opt/usr/media/%' OR path = '/opt/usr/media';
 DELETE FROM media WHERE path LIKE '/opt/storage/%';
 DELETE FROM folder WHERE path LIKE '/opt/storage/%';
 DELETE FROM storage WHERE storage_path LIKE '/opt/storage/%';