Refactor name unpack_directory()

The method unpack_directory() just returns the unpack_directory string,
    but its name implies for class users to "Unpack the directory".
    This commit changes the name from unpack_directory to
    unpacked_dir_path, of the getter, setter, and private variables.

Change-Id: I7259bbb3c8630d7464a98707162d955de45c9432

diff --git a/src/common/context_installer.h b/src/common/context_installer.h
index d9dedf2..6d1d802 100644 (file)
--- a/src/common/context_installer.h
+++ b/src/common/context_installer.h
@@ -89,9 +89,9 @@ class ContextInstaller {
 
   uid_t uid() const { return uid_; }
 
-  std::string unpack_directory() const { return unpack_directory_; }
-  void set_unpack_directory(const std::string& unpack_dir) {
-    unpack_directory_ = unpack_dir;
+  std::string unpacked_dir_path() const { return unpacked_dir_path_; }
+  void set_unpacked_dir_path(const std::string& dir_path) {
+    unpacked_dir_path_ = dir_path;
   }
 
   ConfigData* config_data() const { return config_data_.get(); }
@@ -127,7 +127,7 @@ class ContextInstaller {
   std::string file_path_;
 
   // directory path where app data are temporarily extracted
-  std::string unpack_directory_;
+  std::string unpacked_dir_path_;
 
   // data from config.xml
   ConfigDataPtr config_data_;

diff --git a/src/common/step/step_copy.cc b/src/common/step/step_copy.cc
index daafde7..b8e0332 100644 (file)
--- a/src/common/step/step_copy.cc
+++ b/src/common/step/step_copy.cc
@@ -29,20 +29,20 @@ Step::Status StepCopy::process() {
       !context_->manifest_data()->uiapplication->next)
     install_path /= fs::path(context_->manifest_data()->mainapp_id);
 
-  if (!utils::CopyDir(fs::path(context_->unpack_directory()), install_path)) {
-    LOG(ERROR) << "Fail to copy tmp dir: " << context_->unpack_directory()
-               << " to dst dir: " << install_path.string();
+  if (!utils::CopyDir(fs::path(context_->unpacked_dir_path()), install_path)) {
+    LOG(ERROR) << "Fail to copy tmp dir: " << context_->unpacked_dir_path()
+        << " to dst dir: " << install_path.string();
     return Step::Status::ERROR;
   }
 
-  LOG(INFO) << "Successfully copy: " << context_->unpack_directory()
-            << " to: " << install_path.string() << " directory";
+  LOG(INFO) << "Successfully copy: " << context_->unpacked_dir_path()
+      << " to: " << install_path.string() << " directory";
   return Status::OK;
 }
 
 Step::Status StepCopy::clean() {
-  LOG(DEBUG) << "Remove tmp dir: " << context_->unpack_directory();
-  fs::remove_all(context_->unpack_directory());
+  LOG(DEBUG) << "Remove tmp dir: " << context_->unpacked_dir_path();
+  fs::remove_all(context_->unpacked_dir_path());
   return Status::OK;
 }
 

diff --git a/src/common/step/step_signature.cc b/src/common/step/step_signature.cc
index 151ff89..0dbd0d9 100644 (file)
--- a/src/common/step/step_signature.cc
+++ b/src/common/step/step_signature.cc
@@ -16,7 +16,7 @@ namespace common_installer {
 namespace signature {
 
 Step::Status StepSignature::process() {
-  return (SignatureValidator::Check(bf::path(context_->unpack_directory()))
+  return (SignatureValidator::Check(bf::path(context_->unpacked_dir_path()))
       == SignatureValidator::INVALID) ? Status::ERROR : Status::OK;
 }
 

diff --git a/src/common/step/step_unzip.cc b/src/common/step/step_unzip.cc
index 08d5639..0c47ba9 100644 (file)
--- a/src/common/step/step_unzip.cc
+++ b/src/common/step/step_unzip.cc
@@ -151,17 +151,17 @@ Step::Status StepUnzip::process() {
     LOG(ERROR) << "Failed to process unpack step";
     return Step::Status::ERROR;
   }
-  context_->set_unpack_directory(tmp_dir.string());
+  context_->set_unpacked_dir_path(tmp_dir.string());
 
   LOG(INFO) << context_->file_path() << " was successfully unzipped into "
-            << context_->unpack_directory();
+      << context_->unpacked_dir_path();
   return Status::OK;
 }
 
 Step::Status StepUnzip::undo() {
-  if (access(context_->unpack_directory().c_str(), F_OK) == 0) {
-    boost::filesystem::remove_all(context_->unpack_directory());
-    LOG(DEBUG) << "remove temp dir: " << context_->unpack_directory();
+  if (access(context_->unpacked_dir_path().c_str(), F_OK) == 0) {
+    boost::filesystem::remove_all(context_->unpacked_dir_path());
+    LOG(DEBUG) << "remove temp dir: " << context_->unpacked_dir_path();
   }
   return Status::OK;
 }

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index e52a2b9..da0a942 100644 (file)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -18,7 +18,7 @@ namespace wgt {
 namespace parse {
 
 common_installer::Step::Status StepParse::process() {
-  if (!StepParse::Check(context_->unpack_directory())) {
+  if (!StepParse::Check(context_->unpacked_dir_path())) {
     LOG(ERROR) << "No config.xml";
     return common_installer::Step::Status::ERROR;
   }