From 465c07fc94ac6514bd1f22e9da4a966244a40840 Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Fri, 12 Jan 2018 11:07:53 +0100 Subject: [PATCH] [Archive] Fix for retrieving virtual roots Current implmentation gets only internal virtual roots. This change adds getting external roots as well. [Verification] TCT Archive passed with 100% p.r. Change-Id: Ia961dd276901ed31d42b22d93148d51066276163 Signed-off-by: Szymon Jastrzebski --- src/archive/archive_api.js | 2 +- src/archive/archive_instance.cc | 12 ++++++------ src/archive/archive_instance.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/archive/archive_api.js b/src/archive/archive_api.js index 750ecef..cc1b585 100755 --- a/src/archive/archive_api.js +++ b/src/archive/archive_api.js @@ -25,7 +25,7 @@ CommonFS.cacheVirtualToReal = {}; function _initializeCache() { try { - var result = native_.callSync('Archive_fetchVirtualRoots', {}); + var result = native_.callSync('Archive_fetchStorages', {}); if (native_.isFailure(result)) { throw native_.getErrorObject(result); diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc index a4ebd8c..83063e7 100644 --- a/src/archive/archive_instance.cc +++ b/src/archive/archive_instance.cc @@ -72,7 +72,7 @@ ArchiveInstance::ArchiveInstance() { REGISTER_ASYNC("ArchiveFileEntry_extract", Extract); - REGISTER_SYNC("Archive_fetchVirtualRoots", FetchVirtualRoots); + REGISTER_SYNC("Archive_fetchStorages", FetchStorages); #undef REGISTER_ASYNC #undef REGISTER_SYNC @@ -595,14 +595,14 @@ void ArchiveInstance::Extract(const picojson::value& args, picojson::object& out } } -void ArchiveInstance::FetchVirtualRoots(const picojson::value& args, picojson::object& out) { +void ArchiveInstance::FetchStorages(const picojson::value& args, picojson::object& out) { ScopeLogger(); - picojson::array roots; - for (const auto& root : common::FilesystemProvider::Create().GetVirtualPaths()) { - roots.push_back(root.ToJson()); + picojson::array storages; + for (const auto& storage : common::FilesystemProvider::Create().GetAllStorages()) { + storages.push_back(storage->ToJson()); } - ReportSuccess(picojson::value(roots), out); + ReportSuccess(picojson::value(storages), out); } } // namespace archive diff --git a/src/archive/archive_instance.h b/src/archive/archive_instance.h index 8b55ebf..c9e418b 100644 --- a/src/archive/archive_instance.h +++ b/src/archive/archive_instance.h @@ -48,7 +48,7 @@ class ArchiveInstance : public common::ParsedInstance { void Extract(const picojson::value& args, picojson::object& out); /* Filesystem related method */ - void FetchVirtualRoots(const picojson::value& args, picojson::object& out); + void FetchStorages(const picojson::value& args, picojson::object& out); void PostError(const common::PlatformException& e, double callback_id); void PostError(const common::PlatformResult& e, double callback_id); -- 2.7.4