Move data and database in system directory

All media are media-data directory

Change-Id: Ie4178489497a946be5cc6989a490854e90ec157f
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/lib/include/media-util.h b/lib/include/media-util.h
index d7dc474..e672b4b 100755 (executable)
--- a/lib/include/media-util.h
+++ b/lib/include/media-util.h
@@ -30,9 +30,9 @@
 
 #include <tzplatform_config.h>
 
-#define MEDIA_ROOT_PATH_INTERNAL       tzplatform_getenv(TZ_USER_CONTENT)
+#define MEDIA_ROOT_PATH_INTERNAL       tzplatform_mkpath(TZ_SYS_DATA,"data-media")
 #define MEDIA_ROOT_PATH_SDCARD tzplatform_mkpath(TZ_SYS_STORAGE, "sdcard")
-#define MEDIA_DATA_PATH                tzplatform_mkpath(TZ_USER_DATA, "file-manager-service")
-#define MEDIA_DB_NAME          tzplatform_mkpath(TZ_USER_DB, ".media.db")              /**<  media db name*/
+#define MEDIA_DATA_PATH                tzplatform_mkpath(TZ_SYS_DATA, "file-manager-service")
+#define MEDIA_DB_NAME          tzplatform_mkpath(TZ_SYS_DB, ".media.db")               /**<  media db name*/
 
 #endif /*_MEDIA_UTIL_H_*/

diff --git a/packaging/media-data-sdk_create_db.sh b/packaging/media-data-sdk_create_db.sh
index 9cc29a8..fdde8ff 100644 (file)
--- a/packaging/media-data-sdk_create_db.sh
+++ b/packaging/media-data-sdk_create_db.sh
@@ -2,22 +2,11 @@
 
 source /etc/tizen-platform.conf
 
-mkdir -p $TZ_USER_DB
-mkdir -p $TZ_USER_CONTENT
-mkdir -p  $TZ_USER_DATA
-
-#Init media files tree
-
-mv -f ${TZ_SYS_DATA}/data-media/file-manager-service ${TZ_USER_DATA}/
-mv -f ${TZ_SYS_DATA}/data-media/Camera ${TZ_USER_CONTENT}/
-mv -f ${TZ_SYS_DATA}/data-media/Downloads ${TZ_USER_CONTENT}/
-mv -f ${TZ_SYS_DATA}/data-media/Images ${TZ_USER_CONTENT}/
-mv -f ${TZ_SYS_DATA}/data-media/Sounds ${TZ_USER_CONTENT}/
-mv -f ${TZ_SYS_DATA}/data-media/Videos ${TZ_USER_CONTENT}/
-rm -rf ${TZ_SYS_DATA}/data-media
+mkdir -p $TZ_SYS_DB
+mkdir -p  $TZ_SYS_DATA
 
 #Create DB file
-sqlite3 ${TZ_USER_DB}/.media.db 'PRAGMA journal_mode = PERSIST;
+sqlite3 ${TZ_SYS_DB}/.media.db 'PRAGMA journal_mode = PERSIST;
 
        CREATE TABLE IF NOT EXISTS album (album_id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL, artist TEXT, album_art TEXT, unique(name, artist));
        CREATE TABLE IF NOT EXISTS bookmark (bookmark_id INTEGER PRIMARY KEY AUTOINCREMENT, media_uuid TEXT NOT NULL, marked_time INTEGER DEFAULT 0, thumbnail_path  TEXT, unique(media_uuid, marked_time));
@@ -78,42 +67,42 @@ sqlite3 ${TZ_USER_DB}/.media.db 'PRAGMA journal_mode = PERSIST;
        CREATE TRIGGER playlist_map_cleanup_1 DELETE ON playlist BEGIN DELETE FROM playlist_map WHERE playlist_id=old.playlist_id;END;
        CREATE TRIGGER tag_map_cleanup DELETE ON media BEGIN DELETE FROM tag_map WHERE media_uuid=old.media_uuid;END;
        CREATE TRIGGER tag_map_cleanup_1 DELETE ON tag BEGIN DELETE FROM tag_map WHERE tag_id=old.tag_id;END;
-       INSERT INTO media VALUES("60aea677-4742-408e-b5f7-f2628062d06d","@TZ_USER_IMAGES@/Default.jpg","Default.jpg",0,"image/jpeg",632118,3023047,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-a19569ad296e9655d1fbf216f195f801.jpg","Default",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,280,"2011:10:20 18:41:26",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("84b3a64a-51ef-4b3a-bbaa-c527fbbcfa42","@TZ_USER_IMAGES@/image1.jpg","image1.jpg",0,"image/jpeg",751750,3023268,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-f5052c8428c4a22231d6ece0c63b74bd.jpg","image1",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:08 15:59:47",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("51d282b7-06d7-4bce-aebc-59e46b15f7e7","@TZ_USER_IMAGES@/image13.jpg","image13.jpg",0,"image/jpeg",549310,3023473,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-825ded447a3ce04d14d737f93d7cee26.jpg","image13",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:59:11",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("dd6d7c0b-273d-47f5-8a37-30ebac9ac3a3","@TZ_USER_IMAGES@/image4.jpg","image4.jpg",0,"image/jpeg",609139,3023702,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-8ea059905f24eea065a7998dc5ff1f7e.jpg","image4",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","                               ",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:44:45",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("21141e5d-e6da-45e2-93d6-5fb5c5870adb","@TZ_USER_IMAGES@/image2.jpg","image2.jpg",0,"image/jpeg",254304,3023930,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-93d14e2e94dfbccc9f38a14c4be6a780.jpg","image2",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:08 14:54:05",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("2ec6f64b-c982-4c6a-9a70-1323d27f4aa5","@TZ_USER_IMAGES@/image9.jpg","image9.jpg",0,"image/jpeg",1168466,3024130,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-e82b0d23bfecbddaad1b98be7674b96e.jpg","image9",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:43:39",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("db1c184c-6f31-43b4-b924-8c00ac5b6197","@TZ_USER_IMAGES@/Home_default.jpg","Home_default.jpg",0,"image/jpeg",554116,3024507,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-66784c0b912f077f0a8de56a2f56161e.jpg","Home_default",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2012:02:07 14:44:33",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("1b25f4d9-ffff-4b83-8dbf-187a0a809985","@TZ_USER_IMAGES@/image15.jpg","image15.jpg",0,"image/jpeg",484926,3024713,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-de79768105a730492b3b28ca33ff89f4.jpg","image15",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 15:00:59",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("b3ee9659-22bb-423d-99d0-ed35240545a8","@TZ_USER_IMAGES@/image12.jpg","image12.jpg",0,"image/jpeg",519167,3024908,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-e32fd6fd44abe296c14de2407bab1f93.jpg","image12",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:50:16",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("0d905e54-4583-4de8-80c1-ee4117e06ddf","@TZ_USER_IMAGES@/image11.jpg","image11.jpg",0,"image/jpeg",656364,3025097,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-773fffb8f086e5954f15407b41c2635d.jpg","image11",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2012:02:07 14:49:37",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("bc1eae57-376e-4ff3-b6a0-edcff8c7a1b1","@TZ_USER_IMAGES@/image5.jpg","image5.jpg",0,"image/jpeg",773064,3025291,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-c468b6d8820bfc0d9311d76f6575251a.jpg","image5",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:45:14",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("eec305ed-ccb4-4abb-93f9-f087c823b1d4","@TZ_USER_IMAGES@/image6.jpg","image6.jpg",0,"image/jpeg",682883,3025500,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-10555c13cdfe5a763a69e08489de3c70.jpg","image6",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:39:26",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("53101826-d64e-4d26-b448-acc1d94511a5","@TZ_USER_IMAGES@/image14.jpg","image14.jpg",0,"image/jpeg",452386,3025742,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-6f7e6adae30603c45be7db083610d0a3.jpg","image14",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:59:44",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("dbf546ed-e984-45de-a85e-b1d750005036","@TZ_USER_IMAGES@/image8.jpg","image8.jpg",0,"image/jpeg",930876,3026032,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-5876701a15ec16bd0226ed00044cad92.jpg","image8",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:21 10:01:44",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("696835a1-eaec-4602-8310-5e7ad9f4429b","@TZ_USER_IMAGES@/image10.jpg","image10.jpg",0,"image/jpeg",1236980,3027125,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-70a952ceff9175115b8c3fd044cdf978.jpg","image10",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:43:24",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("4a76c208-ca95-4b2f-9de1-86c82a45506d","@TZ_USER_IMAGES@/image16.jpg","image16.jpg",0,"image/jpeg",1443416,3027413,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-aa5afe63b8aaa41079f9f37297d0763f.jpg","image16",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2011:10:20 18:42:06",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("83b9fd32-cd53-4ba7-84b8-c3d507f4701d","@TZ_USER_IMAGES@/image7.jpg","image7.jpg",0,"image/jpeg",1073428,3027698,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-fc4557b53139ca8f35a3f13cea24ed13.jpg","image7",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2011:10:20 18:41:51",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO media VALUES("a2b3cbf8-82e3-456f-b912-74b0a646da6e","@TZ_USER_IMAGES@/image3.jpg","image3.jpg",0,"image/jpeg",738597,3027977,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_DATA@/file-manager-service/.thumb/phone/.jpg-03bdfd7e4d43c736819639b84a590b5f.jpg","image3",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:46:13",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
-       INSERT INTO folder VALUES("baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_USER_IMAGES@","Images",1337008628,0);
+       INSERT INTO media VALUES("60aea677-4742-408e-b5f7-f2628062d06d","@TZ_SYS_DATA@/data-media/Images/Default.jpg","Default.jpg",0,"image/jpeg",632118,3023047,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-a19569ad296e9655d1fbf216f195f801.jpg","Default",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,280,"2011:10:20 18:41:26",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("84b3a64a-51ef-4b3a-bbaa-c527fbbcfa42","@TZ_SYS_DATA@/data-media/Images/data-media/Images/image1.jpg","image1.jpg",0,"image/jpeg",751750,3023268,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-f5052c8428c4a22231d6ece0c63b74bd.jpg","image1",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:08 15:59:47",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("51d282b7-06d7-4bce-aebc-59e46b15f7e7","@TZ_SYS_DATA@/data-media/Images/image13.jpg","image13.jpg",0,"image/jpeg",549310,3023473,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-825ded447a3ce04d14d737f93d7cee26.jpg","image13",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:59:11",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("dd6d7c0b-273d-47f5-8a37-30ebac9ac3a3","@TZ_SYS_DATA@/data-media/Images/image4.jpg","image4.jpg",0,"image/jpeg",609139,3023702,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-8ea059905f24eea065a7998dc5ff1f7e.jpg","image4",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","                               ",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:44:45",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("21141e5d-e6da-45e2-93d6-5fb5c5870adb","@TZ_SYS_DATA@/data-media/Images/image2.jpg","image2.jpg",0,"image/jpeg",254304,3023930,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-93d14e2e94dfbccc9f38a14c4be6a780.jpg","image2",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:08 14:54:05",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("2ec6f64b-c982-4c6a-9a70-1323d27f4aa5","@TZ_SYS_DATA@/data-media/Images/image9.jpg","image9.jpg",0,"image/jpeg",1168466,3024130,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-e82b0d23bfecbddaad1b98be7674b96e.jpg","image9",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:43:39",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("db1c184c-6f31-43b4-b924-8c00ac5b6197","@TZ_SYS_DATA@/data-media/Images/Home_default.jpg","Home_default.jpg",0,"image/jpeg",554116,3024507,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-66784c0b912f077f0a8de56a2f56161e.jpg","Home_default",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2012:02:07 14:44:33",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("1b25f4d9-ffff-4b83-8dbf-187a0a809985","@TZ_SYS_DATA@/data-media/Images/image15.jpg","image15.jpg",0,"image/jpeg",484926,3024713,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-de79768105a730492b3b28ca33ff89f4.jpg","image15",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 15:00:59",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("b3ee9659-22bb-423d-99d0-ed35240545a8","@TZ_SYS_DATA@/data-media/Images/image12.jpg","image12.jpg",0,"image/jpeg",519167,3024908,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-e32fd6fd44abe296c14de2407bab1f93.jpg","image12",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:50:16",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("0d905e54-4583-4de8-80c1-ee4117e06ddf","@TZ_SYS_DATA@/data-media/Images/image11.jpg","image11.jpg",0,"image/jpeg",656364,3025097,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-773fffb8f086e5954f15407b41c2635d.jpg","image11",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2012:02:07 14:49:37",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("bc1eae57-376e-4ff3-b6a0-edcff8c7a1b1","@TZ_SYS_DATA@/data-media/Images/image5.jpg","image5.jpg",0,"image/jpeg",773064,3025291,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-c468b6d8820bfc0d9311d76f6575251a.jpg","image5",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:45:14",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("eec305ed-ccb4-4abb-93f9-f087c823b1d4","@TZ_SYS_DATA@/data-media/Images/image6.jpg","image6.jpg",0,"image/jpeg",682883,3025500,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-10555c13cdfe5a763a69e08489de3c70.jpg","image6",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:39:26",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("53101826-d64e-4d26-b448-acc1d94511a5","@TZ_SYS_DATA@/data-media/Images/image14.jpg","image14.jpg",0,"image/jpeg",452386,3025742,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-6f7e6adae30603c45be7db083610d0a3.jpg","image14",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:59:44",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("dbf546ed-e984-45de-a85e-b1d750005036","@TZ_SYS_DATA@/data-media/Images/image8.jpg","image8.jpg",0,"image/jpeg",930876,3026032,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-5876701a15ec16bd0226ed00044cad92.jpg","image8",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:21 10:01:44",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("696835a1-eaec-4602-8310-5e7ad9f4429b","@TZ_SYS_DATA@/data-media/Images/image10.jpg","image10.jpg",0,"image/jpeg",1236980,3027125,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-70a952ceff9175115b8c3fd044cdf978.jpg","image10",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2011:10:20 18:43:24",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("4a76c208-ca95-4b2f-9de1-86c82a45506d","@TZ_SYS_DATA@/data-media/Images/image16.jpg","image16.jpg",0,"image/jpeg",1443416,3027413,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-aa5afe63b8aaa41079f9f37297d0763f.jpg","image16",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2011:10:20 18:42:06",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("83b9fd32-cd53-4ba7-84b8-c3d507f4701d","@TZ_SYS_DATA@/data-media/Images/image7.jpg","image7.jpg",0,"image/jpeg",1073428,3027698,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-fc4557b53139ca8f35a3f13cea24ed13.jpg","image7",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,720,1280,"2011:10:20 18:41:51",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO media VALUES("a2b3cbf8-82e3-456f-b912-74b0a646da6e","@TZ_SYS_DATA@/data-media/Images/image3.jpg","image3.jpg",0,"image/jpeg",738597,3027977,1337008628,"baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/file-manager-service/.thumb/phone/.jpg-03bdfd7e4d43c736819639b84a590b5f.jpg","image3",0,"Unknown","Unknown","Unknown","Unknown","Unknown",NULL,"Unknown","Unknown","Unknown",0,0,0,0,-200.0,-200.0,-200.0,1280,720,"2012:02:07 14:46:13",1,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1);
+       INSERT INTO folder VALUES("baeb79e5-a9da-4667-aeaf-6b98830e4ce8","@TZ_SYS_DATA@/data-media/Images/","Images",1337008628,0);
 '
 
 #Change permission
-chmod 664 ${TZ_USER_DB}/.media.db
-chmod 664 ${TZ_USER_DB}/.media.db-journal
-chmod 666 ${TZ_USER_IMAGES}
+chmod 664 ${TZ_SYS_DB}/.media.db
+chmod 664 ${TZ_SYS_DB}/.media.db-journal
+chmod 666 ${TZ_SYS_DATA}/data-media/Images
 
 #Change owner
-chown -R $TZ_USER_NAME:$TZ_SYS_USER_GROUP $TZ_USER_CONTENT/*
+chown -R :$TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/data-media/*
 
 #Change group (6017: db_filemanager 5000: app)
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DB}
-chgrp 6017 ${TZ_USER_DB}/.media.db
-chgrp 6017 ${TZ_USER_DB}/.media.db-journal
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DATA}/file-manager-service/
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DATA}/file-manager-service/.thumb
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DATA}/file-manager-service/.thumb/phone
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DATA}/file-manager-service/.thumb/phone/.[a-z0-9]*.*
-chgrp $TZ_SYS_USER_GROUP ${TZ_USER_DATA}/file-manager-service/.thumb/mmc
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DB}
+chgrp 6017 ${TZ_SYS_DB}/.media.db
+chgrp 6017 ${TZ_SYS_DB}/.media.db-journal
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/file-manager-service/
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/file-manager-service/.thumb
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/file-manager-service/.thumb/phone
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/file-manager-service/.thumb/phone/.[a-z0-9]*.*
+chgrp $TZ_SYS_USER_GROUP ${TZ_SYS_DATA}/file-manager-service/.thumb/mmc
 

diff --git a/src/common/include/media-common-types.h b/src/common/include/media-common-types.h
index 31ee9b9..a46488b 100755 (executable)
--- a/src/common/include/media-common-types.h
+++ b/src/common/include/media-common-types.h
@@ -51,7 +51,7 @@
 
 /*Use for Poweroff sequence*/
 #define POWEROFF_NOTI_NAME "power_off_start" /*poeroff noti from system-server*/
-#define POWEROFF_DIR_PATH tzplatform_mkpath(TZ_USER_CONTENT,"_POWER_OFF") /*This path uses for stopping Inotify thread and Socket thread*/
+#define POWEROFF_DIR_PATH tzplatform_mkpath(TZ_SYS_DATA,"data-media/_POWER_OFF") /*This path uses for stopping Inotify thread and Socket thread*/
 #define POWEROFF_DIR_NAME "_POWER_OFF" /*This path uses for stopping Inotify thread and Socket thread*/
 #define POWEROFF -1 /*This number uses for stopping Scannig thread*/
 

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 8ea97cb..fefeaf3 100644 (file)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -53,7 +53,7 @@ void print_help()
        printf("\n");
        printf("db-update --help for check this messages.\n");
        printf("\n");
-       printf("A file or directory must exists under %s or %s.\n",tzplatform_mkpath(TZ_USER_CONTENT,""),tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard"));
+       printf("A file or directory must exists under %s or %s.\n",tzplatform_mkpath(TZ_SYS_DATA,"data-media"),tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard"));
        printf("Using %s is allowed SD card is mounted.\n",tzplatform_mkpath(TZ_SYS_STORAGE,"sdcard"));
        printf("\n");
        printf("=======================================================================================\n");

diff --git a/src/scanner/media-scanner-db-svc.c b/src/scanner/media-scanner-db-svc.c
index 3cdf64b..60dd0ee 100755 (executable)
--- a/src/scanner/media-scanner-db-svc.c
+++ b/src/scanner/media-scanner-db-svc.c
@@ -39,7 +39,7 @@
 
 #include <tzplatform_config.h>
 
-#define CONFIG_PATH tzplatform_mkpath(TZ_USER_DATA,"file-manager-service/plugin-config")
+#define CONFIG_PATH tzplatform_mkpath(TZ_SYS_DATA,"data-media/file-manager-service/plugin-config")
 #define EXT ".so"
 #define EXT_LEN 3
 #define MSC_REGISTER_COUNT 100 /*For bundle commit*/

diff --git a/src/server/media-server-db-svc.c b/src/server/media-server-db-svc.c
index 6b0c15c..ba22ac3 100755 (executable)
--- a/src/server/media-server-db-svc.c
+++ b/src/server/media-server-db-svc.c
@@ -39,7 +39,7 @@
 
 #include <tzplatform_config.h>
 
-#define CONFIG_PATH tzplatform_mkpath(TZ_USER_DATA,"file-manager-service/plugin-config")
+#define CONFIG_PATH tzplatform_mkpath(TZ_SYS_DATA,"data-media/file-manager-service/plugin-config")
 #define EXT ".so"
 #define EXT_LEN 3