[Filesystem] List of virtual roots for resolve function fixed.

Current implementation of virtual roots list did not include internal0 or
external memory i.e. SDCard or USBDrive. It results in not working resolve()
function, when location to resolve was on external memory.

Verification: TCT - 100 % pass.

Change-Id: I11c2537a7f5643f8c9ccfe2f45be9f3bce3edf00
Signed-off-by: Rafal Walczyna <r.walczyna@samsung.com>

diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc
index 6c2367fdfa7508e2ec0ab76c483dd1df6aed21c8..d8b69fc4035a231f62b3d07d179cb712ed6dbc76 100644 (file)
--- a/src/filesystem/filesystem_instance.cc
+++ b/src/filesystem/filesystem_instance.cc
@@ -57,7 +57,7 @@ FilesystemInstance::FilesystemInstance() {
   REGISTER_SYNC("File_writeBytes", FileWriteBytes);
   REGISTER_SYNC("File_writeBase64", FileWriteBase64);
   REGISTER_SYNC("File_writeString", FileWriteString);
-  REGISTER_SYNC("Filesystem_fetchVirtualRoots", FilesystemFetchVirtualRoots);
+  REGISTER_SYNC("Filesystem_fetchAllStorages", FilesystemFetchAllStorages)
   REGISTER_SYNC("FileSystemManager_addStorageStateChangeListener", StartListening);
   REGISTER_SYNC("FileSystemManager_removeStorageStateChangeListener", StopListening);
   REGISTER_SYNC("FileSystemManager_fetchStorages", FileSystemManagerFetchStorages);
@@ -512,15 +512,15 @@ void FilesystemInstance::FileStatSync(const picojson::value& args, picojson::obj
   FilesystemManager::GetInstance().StatPath(location, onSuccess, onError);
 }
 
-void FilesystemInstance::FilesystemFetchVirtualRoots(const picojson::value& args,
+void FilesystemInstance::FilesystemFetchAllStorages(const picojson::value& args,
                                                      picojson::object& out) {
   ScopeLogger();
 
-  auto onSuccess = [&](const std::vector<common::VirtualRoot>& result) {
+  auto onSuccess = [&](const common::VirtualStorages& result) {
     ScopeLogger("Entered into asynchronous function, onSuccess");
     picojson::array roots;
     for (const auto& root : result) {
-      roots.push_back(root.ToJson());
+      roots.push_back(root->ToJson());
     }
     ReportSuccess(picojson::value(roots), out);
   };
@@ -530,7 +530,7 @@ void FilesystemInstance::FilesystemFetchVirtualRoots(const picojson::value& args
     PrepareError(e, out);
   };
 
-  FilesystemManager::GetInstance().GetVirtualRoots(onSuccess, onError);
+  FilesystemManager::GetInstance().FetchAllStorages(onSuccess, onError);
 }
 
 void FilesystemInstance::FileSystemManagerFetchStorages(const picojson::value& args,

diff --git a/src/filesystem/filesystem_instance.h b/src/filesystem/filesystem_instance.h
index 07fb8fa8460e4f27013c02dd005ae92b4852a91b..34c28ed6319ac5dcdb395abfd0a0a6c66ef0b303 100644 (file)
--- a/src/filesystem/filesystem_instance.h
+++ b/src/filesystem/filesystem_instance.h
@@ -40,7 +40,7 @@ class FilesystemInstance : public common::ParsedInstance, FilesystemStateChangeL
   void FileWriteBytes(const picojson::value& args, picojson::object& out);
   void FileWriteBase64(const picojson::value& args, picojson::object& out);
   void FileWriteString(const picojson::value& args, picojson::object& out);
-  void FilesystemFetchVirtualRoots(const picojson::value& args, picojson::object& out);
+  void FilesystemFetchAllStorages(const picojson::value& args, picojson::object& out);
   void FileSystemManagerFetchStorages(const picojson::value& args, picojson::object& out);
   void FileSystemManagerMakeDirectory(const picojson::value& args, picojson::object& out);
   void FileSystemManagerMakeDirectorySync(const picojson::value& args, picojson::object& out);

diff --git a/src/filesystem/filesystem_manager.cc b/src/filesystem/filesystem_manager.cc
index 5050a0ae41a6da234e3e23ccf993e076b0f20572..4a2186bc598a20ca6c908d4cd18cc2972483eea6 100644 (file)
--- a/src/filesystem/filesystem_manager.cc
+++ b/src/filesystem/filesystem_manager.cc
@@ -248,11 +248,11 @@ void FilesystemManager::StatPath(const std::string& path,
   success_cb(statData);
 }
 
-void FilesystemManager::GetVirtualRoots(
-    const std::function<void(const common::VirtualRoots&)>& success_cb,
+void FilesystemManager::FetchAllStorages(
+    const std::function<void(const common::VirtualStorages&)>& success_cb,
     const std::function<void(FilesystemError)>& error_cb) {
   ScopeLogger();
-  success_cb(fs_provider_.GetVirtualPaths());
+  success_cb(fs_provider_.GetAllStorages());
 }
 
 void FilesystemManager::CreateFile(const std::string& path,

diff --git a/src/filesystem/filesystem_manager.h b/src/filesystem/filesystem_manager.h
index e0d2d12b8aa809e56db0dee5f7c4c67d87b70346..2a830977cf50a1a99022c255b64a385502b96ff2 100644 (file)
--- a/src/filesystem/filesystem_manager.h
+++ b/src/filesystem/filesystem_manager.h
@@ -62,7 +62,7 @@ class FilesystemManager {
   void FetchStorages(const std::function<void(const common::Storages&)>& success_cb,
                      const std::function<void(FilesystemError)>& error_cb);
 
-  void GetVirtualRoots(const std::function<void(const common::VirtualRoots&)>& success_cb,
+  void FetchAllStorages(const std::function<void(const common::VirtualStorages&)>& success_cb,
                        const std::function<void(FilesystemError)>& error_cb);
 
   void CreateFile(const std::string& path,

diff --git a/src/filesystem/js/common.js b/src/filesystem/js/common.js
index 30dc3594758d0a8713aa0b7348120a6b412d27aa..1817a219e47dc436715f5fabc584806d4219b356 100644 (file)
--- a/src/filesystem/js/common.js
+++ b/src/filesystem/js/common.js
@@ -95,8 +95,7 @@ var commonFS_ = (function() {
         if (cacheReady) {
             return;
         }
-
-        var result = native_.callSync('Filesystem_fetchVirtualRoots', {});
+        var result = native_.callSync('Filesystem_fetchAllStorages', {});
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -106,8 +105,8 @@ var commonFS_ = (function() {
             cacheVirtualToReal[virtualRoots[i].name] = {
                 path: virtualRoots[i].path,
                 label: virtualRoots[i].name,
-                type: FileSystemStorageType.INTERNAL,
-                state: FileSystemStorageState.MOUNTED
+                type: virtualRoots[i].type,
+                state: virtualRoots[i].state
             };
         }
         // initalize home directory for correct mapping global paths from tizen 2.4
@@ -267,14 +266,24 @@ var commonFS_ = (function() {
         }
 
         initCache();
-
+        // find virtual root with longest path
+        var foundLength = 0;
+        var foundVirtualRoot;
+        var foundVirtualPath;
         for (var virtual_root in cacheVirtualToReal) {
-            var real_root_path = cacheVirtualToReal[virtual_root].path;
-            if (_virtualPath.indexOf(real_root_path, 0) === 0) {
-                return _virtualPath.replace(real_root_path, virtual_root);
+            var real_root_path = cacheVirtualToReal[virtual_root].path
+            if(_virtualPath.indexOf(real_root_path, 0) === 0) {
+                var currentLength = real_root_path.length;
+                if(currentLength > foundLength) {
+                  foundLength = currentLength;
+                  foundVirtualRoot = virtual_root;
+                  foundVirtualPath  = real_root_path
+                }
             }
         }
-
+        if(foundLength != 0) {
+            return _virtualPath.replace(foundVirtualPath, foundVirtualRoot);
+        }
         return _virtualPath;
     }