Change media-server-plugin path

Remove media files

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

diff --git a/data-media/Images/Default.jpg b/data-media/Images/Default.jpg
deleted file mode 100755 (executable)
index 10f4b14..0000000
Binary files a/data-media/Images/Default.jpg and /dev/null differ

diff --git a/data-media/Images/Home_default.jpg b/data-media/Images/Home_default.jpg
deleted file mode 100755 (executable)
index 31fe40c..0000000
Binary files a/data-media/Images/Home_default.jpg and /dev/null differ

diff --git a/data-media/Images/image1.jpg b/data-media/Images/image1.jpg
deleted file mode 100755 (executable)
index 38bc5a9..0000000
Binary files a/data-media/Images/image1.jpg and /dev/null differ

diff --git a/data-media/Images/image10.jpg b/data-media/Images/image10.jpg
deleted file mode 100755 (executable)
index ef663e1..0000000
Binary files a/data-media/Images/image10.jpg and /dev/null differ

diff --git a/data-media/Images/image11.jpg b/data-media/Images/image11.jpg
deleted file mode 100755 (executable)
index d773a5f..0000000
Binary files a/data-media/Images/image11.jpg and /dev/null differ

diff --git a/data-media/Images/image12.jpg b/data-media/Images/image12.jpg
deleted file mode 100755 (executable)
index 969cb74..0000000
Binary files a/data-media/Images/image12.jpg and /dev/null differ

diff --git a/data-media/Images/image13.jpg b/data-media/Images/image13.jpg
deleted file mode 100755 (executable)
index 86eaa02..0000000
Binary files a/data-media/Images/image13.jpg and /dev/null differ

diff --git a/data-media/Images/image14.jpg b/data-media/Images/image14.jpg
deleted file mode 100755 (executable)
index d66f344..0000000
Binary files a/data-media/Images/image14.jpg and /dev/null differ

diff --git a/data-media/Images/image15.jpg b/data-media/Images/image15.jpg
deleted file mode 100755 (executable)
index 5c8f068..0000000
Binary files a/data-media/Images/image15.jpg and /dev/null differ

diff --git a/data-media/Images/image16.jpg b/data-media/Images/image16.jpg
deleted file mode 100755 (executable)
index cd6d281..0000000
Binary files a/data-media/Images/image16.jpg and /dev/null differ

diff --git a/data-media/Images/image2.jpg b/data-media/Images/image2.jpg
deleted file mode 100755 (executable)
index 9e275d3..0000000
Binary files a/data-media/Images/image2.jpg and /dev/null differ

diff --git a/data-media/Images/image3.jpg b/data-media/Images/image3.jpg
deleted file mode 100755 (executable)
index 5693394..0000000
Binary files a/data-media/Images/image3.jpg and /dev/null differ

diff --git a/data-media/Images/image4.jpg b/data-media/Images/image4.jpg
deleted file mode 100755 (executable)
index c6a8896..0000000
Binary files a/data-media/Images/image4.jpg and /dev/null differ

diff --git a/data-media/Images/image5.jpg b/data-media/Images/image5.jpg
deleted file mode 100755 (executable)
index 6647484..0000000
Binary files a/data-media/Images/image5.jpg and /dev/null differ

diff --git a/data-media/Images/image6.jpg b/data-media/Images/image6.jpg
deleted file mode 100755 (executable)
index c3f06fe..0000000
Binary files a/data-media/Images/image6.jpg and /dev/null differ

diff --git a/data-media/Images/image7.jpg b/data-media/Images/image7.jpg
deleted file mode 100755 (executable)
index e74b93c..0000000
Binary files a/data-media/Images/image7.jpg and /dev/null differ

diff --git a/data-media/Images/image8.jpg b/data-media/Images/image8.jpg
deleted file mode 100755 (executable)
index aa96a3e..0000000
Binary files a/data-media/Images/image8.jpg and /dev/null differ

diff --git a/data-media/Images/image9.jpg b/data-media/Images/image9.jpg
deleted file mode 100755 (executable)
index a7b964f..0000000
Binary files a/data-media/Images/image9.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/mmc/MMC_THUMB_HERE b/data-media/dbspace/file-manager-service/.thumb/mmc/MMC_THUMB_HERE
deleted file mode 100644 (file)
index a0dd7a9..0000000
--- a/data-media/dbspace/file-manager-service/.thumb/mmc/MMC_THUMB_HERE
+++ /dev/null
@@ -1 +0,0 @@
-MMC_THUMB_HERE

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-03bdfd7e4d43c736819639b84a590b5f.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-03bdfd7e4d43c736819639b84a590b5f.jpg
deleted file mode 100644 (file)
index 478cd44..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-03bdfd7e4d43c736819639b84a590b5f.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-10555c13cdfe5a763a69e08489de3c70.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-10555c13cdfe5a763a69e08489de3c70.jpg
deleted file mode 100644 (file)
index 2594c70..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-10555c13cdfe5a763a69e08489de3c70.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-5876701a15ec16bd0226ed00044cad92.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-5876701a15ec16bd0226ed00044cad92.jpg
deleted file mode 100644 (file)
index a143fa7..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-5876701a15ec16bd0226ed00044cad92.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-66784c0b912f077f0a8de56a2f56161e.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-66784c0b912f077f0a8de56a2f56161e.jpg
deleted file mode 100644 (file)
index d30cd50..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-66784c0b912f077f0a8de56a2f56161e.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-6f7e6adae30603c45be7db083610d0a3.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-6f7e6adae30603c45be7db083610d0a3.jpg
deleted file mode 100644 (file)
index 4ab066e..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-6f7e6adae30603c45be7db083610d0a3.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-70a952ceff9175115b8c3fd044cdf978.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-70a952ceff9175115b8c3fd044cdf978.jpg
deleted file mode 100644 (file)
index 25ef052..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-70a952ceff9175115b8c3fd044cdf978.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-773fffb8f086e5954f15407b41c2635d.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-773fffb8f086e5954f15407b41c2635d.jpg
deleted file mode 100644 (file)
index 4f052d6..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-773fffb8f086e5954f15407b41c2635d.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-825ded447a3ce04d14d737f93d7cee26.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-825ded447a3ce04d14d737f93d7cee26.jpg
deleted file mode 100644 (file)
index 4793265..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-825ded447a3ce04d14d737f93d7cee26.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-8ea059905f24eea065a7998dc5ff1f7e.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-8ea059905f24eea065a7998dc5ff1f7e.jpg
deleted file mode 100644 (file)
index a74595b..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-8ea059905f24eea065a7998dc5ff1f7e.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-93d14e2e94dfbccc9f38a14c4be6a780.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-93d14e2e94dfbccc9f38a14c4be6a780.jpg
deleted file mode 100644 (file)
index 9ceadc8..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-93d14e2e94dfbccc9f38a14c4be6a780.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-a19569ad296e9655d1fbf216f195f801.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-a19569ad296e9655d1fbf216f195f801.jpg
deleted file mode 100644 (file)
index 89936b4..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-a19569ad296e9655d1fbf216f195f801.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-aa5afe63b8aaa41079f9f37297d0763f.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-aa5afe63b8aaa41079f9f37297d0763f.jpg
deleted file mode 100644 (file)
index ba647d4..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-aa5afe63b8aaa41079f9f37297d0763f.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-c468b6d8820bfc0d9311d76f6575251a.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-c468b6d8820bfc0d9311d76f6575251a.jpg
deleted file mode 100644 (file)
index d64dfcf..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-c468b6d8820bfc0d9311d76f6575251a.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-de79768105a730492b3b28ca33ff89f4.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-de79768105a730492b3b28ca33ff89f4.jpg
deleted file mode 100644 (file)
index 2029063..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-de79768105a730492b3b28ca33ff89f4.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e32fd6fd44abe296c14de2407bab1f93.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e32fd6fd44abe296c14de2407bab1f93.jpg
deleted file mode 100644 (file)
index 5d55c0d..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e32fd6fd44abe296c14de2407bab1f93.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e82b0d23bfecbddaad1b98be7674b96e.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e82b0d23bfecbddaad1b98be7674b96e.jpg
deleted file mode 100644 (file)
index d7f4921..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-e82b0d23bfecbddaad1b98be7674b96e.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-f5052c8428c4a22231d6ece0c63b74bd.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-f5052c8428c4a22231d6ece0c63b74bd.jpg
deleted file mode 100644 (file)
index 5069eee..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-f5052c8428c4a22231d6ece0c63b74bd.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-fc4557b53139ca8f35a3f13cea24ed13.jpg b/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-fc4557b53139ca8f35a3f13cea24ed13.jpg
deleted file mode 100644 (file)
index 46929cb..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/phone/.jpg-fc4557b53139ca8f35a3f13cea24ed13.jpg and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE b/data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/data-media/dbspace/file-manager-service/.thumb/thumb_default.png b/data-media/dbspace/file-manager-service/.thumb/thumb_default.png
deleted file mode 100644 (file)
index 9326d0a..0000000
Binary files a/data-media/dbspace/file-manager-service/.thumb/thumb_default.png and /dev/null differ

diff --git a/data-media/dbspace/file-manager-service/plugin-config b/media-server-plugin
similarity index 100%
rename from data-media/dbspace/file-manager-service/plugin-config
rename to media-server-plugin

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index 8041331..9323c12 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -67,28 +67,12 @@ mkdir -p %{buildroot}%{_unitdir_user}
 install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/media-server-user.service
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-server-user.path
 ln -s ../media-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/media-server.service
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Camera
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Downloads
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Images
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Sounds/Voice\ recorder
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/data-media/Videos
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/mmc
-mkdir -p %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone
-install -m 0775 ./data-media/Images/* %{buildroot}%{TZ_SYS_DATA}/data-media/Images/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/thumb_default.png %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/
-install -D -m 0775 ./data-media/dbspace/file-manager-service/.thumb/mmc/* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/mmc/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/PHONE_THUMB_HERE %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone/
-install -m 0775 ./data-media/dbspace/file-manager-service/.thumb/phone/.jpg* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/.thumb/phone/
-install -D -m 0775 ./data-media/dbspace/file-manager-service/* %{buildroot}%{TZ_SYS_DATA}/file-manager-service/
-
 #ini file
 mkdir -p %{buildroot}/usr/etc
 cp -rf %{_builddir}/%{name}-%{version}/media_content_config.ini %{buildroot}/usr/etc/
+cp -rf %{_builddir}/%{name}-%{version}/media-server-plugin %{buildroot}/usr/etc/media-server-plugin
 
 %post
-chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/data-media
-chgrp -R %TZ_SYS_USER_GROUP %{TZ_SYS_DATA}/file-manager-service
-
 # setup dbupdate in user session
 mkdir -p %{_unitdir_user}/default.target.wants/
 ln -sf ../media-server-user.path  %{_unitdir_user}/default.target.wants/
@@ -112,10 +96,8 @@ ln -sf ../media-server-user.path  %{_unitdir_user}/default.target.wants/
 %{_unitdir_user}/media-server-user.service
 %{_unitdir_user}/media-server-user.path
 /usr/etc/media_content_config.ini
+/usr/etc/media-server-plugin
 %license LICENSE.APLv2.0
-%{TZ_SYS_DATA}/data-media/*
-%{TZ_SYS_DATA}/file-manager-service/.thumb/*
-%{TZ_SYS_DATA}/file-manager-service/plugin-config
 
 %files -n libmedia-utils
 %manifest libmedia-utils.manifest

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index f741a92..5f24c4b 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -27,7 +27,7 @@
 #include "media-common-dbg.h"
 #include <tzplatform_config.h>
 
-#define CONFIG_PATH tzplatform_mkpath(TZ_SYS_DATA, "file-manager-service/plugin-config")
+#define CONFIG_PATH "/usr/etc/media-server-plugin"
 #define EXT ".so"
 #define EXT_LEN 3
 #define MSC_REGISTER_COUNT 300 /*For bundle commit*/