tizen 2.4 release

[framework/web/wrt-installer.git] / src / jobs / widget_install / task_prepare_files.cpp

diff --git a/src_mobile/jobs/widget_install/task_prepare_files.cpp b/src/jobs/widget_install/task_prepare_files.cpp
similarity index 81%
rename from src_mobile/jobs/widget_install/task_prepare_files.cpp
rename to src/jobs/widget_install/task_prepare_files.cpp
index 55791f4..77fbe82 100644 (file)
--- a/src_mobile/jobs/widget_install/task_prepare_files.cpp
+++ b/src/jobs/widget_install/task_prepare_files.cpp
@@ -31,13 +31,13 @@
 #include <widget_install/widget_install_context.h>
 #include <widget_install_errors.h>
 #include <task_commons.h>
-#include <installer_log.h>
+#include <dpl/log/secure_log.h>
 
 namespace Jobs {
 namespace WidgetInstall {
-TaskPrepareFiles::TaskPrepareFiles(InstallerContext &installerContext) :
+TaskPrepareFiles::TaskPrepareFiles(JobWidgetInstall * const &jobContext) :
     DPL::TaskDecl<TaskPrepareFiles>(this),
-    m_installerContext(installerContext)
+    m_jobContext(jobContext)
 {
     AddStep(&TaskPrepareFiles::StartStep);
     AddStep(&TaskPrepareFiles::StepCopyFiles);
@@ -57,7 +57,7 @@ void TaskPrepareFiles::CopyFile(const std::string& source)
         filename = source.substr(last + 1);
     }
     std::string target =
-        m_installerContext.locations->getSourceDir() + '/' +
+        m_jobContext->m_installerContext.locations->getSourceDir() + '/' +
         filename;
     _D("source %s", source.c_str());
     _D("target %s", target.c_str());
@@ -90,20 +90,20 @@ void TaskPrepareFiles::CopyFile(const std::string& source)
 
 void TaskPrepareFiles::StepCopyFiles()
 {
-    CopyFile(m_installerContext.locations->getWidgetSource());
+    CopyFile(m_jobContext->m_installerContext.locations->getWidgetSource());
 
-    size_t last = m_installerContext.locations->getWidgetSource().find_last_of(
+    size_t last = m_jobContext->m_installerContext.locations->getWidgetSource().find_last_of(
             "\\/");
     std::string sourceDir = "";
     if (last != std::string::npos) {
-        sourceDir = m_installerContext.locations->getWidgetSource().substr(
+        sourceDir = m_jobContext->m_installerContext.locations->getWidgetSource().substr(
                 0,
                 last
                 + 1);
     }
 
     _D("Icons copy...");
-    FOREACH(it, m_installerContext.widgetConfig.configInfo.iconsList) {
+    FOREACH(it, m_jobContext->m_installerContext.widgetConfig.configInfo.iconsList) {
         std::ostringstream os;
         _D("Coping: %s%ls", sourceDir.c_str(), (it->src).c_str());
         os << sourceDir << DPL::ToUTF8String(it->src);
@@ -113,12 +113,12 @@ void TaskPrepareFiles::StepCopyFiles()
 
 void TaskPrepareFiles::StartStep()
 {
-    _D("--------- <TaskPrepareFiles> : START ----------");
+    LOGI("--------- <TaskPrepareFiles> : START ----------");
 }
 
 void TaskPrepareFiles::EndStep()
 {
-    _D("--------- <TaskPrepareFiles> : END ----------");
+    LOGI("--------- <TaskPrepareFiles> : END ----------");
 }
 } // namespace WidgetInstall
 } // namespace Jobs