[Release] wrt-installer_0.1.53

[framework/web/wrt-installer.git] / src / wrt-installer / wrt_installer_api.cpp

diff --git a/src/wrt-installer/wrt_installer_api.cpp b/src/wrt-installer/wrt_installer_api.cpp
index 6280dd6..83b5172 100644 (file)
--- a/src/wrt-installer/wrt_installer_api.cpp
+++ b/src/wrt-installer/wrt_installer_api.cpp
@@ -45,31 +45,10 @@
 #include <dpl/wrt-dao-ro/WrtDatabase.h>
 #include <vcore/VCore.h>
 #include <installer_main_thread.h>
+#include <wrt_install_mode.h>
 
 using namespace WrtDB;
 
-#ifdef __cplusplus
-
-#define EXPORT_API __attribute__((visibility("default")))
-extern "C"
-{
-#endif
-inline InstallMode::Type translateInstallMode(
-    WrtInstallMode installMode)
-{
-    if (WRT_INSTALL_MODE_INSTALL_WGT == installMode) {
-        return InstallMode::INSTALL_MODE_WGT;
-    } else if (WRT_INSTALL_MODE_INSTALL_DIRECTORY == installMode) {
-        return InstallMode::INSTALL_MODE_DIRECTORY;
-    } else if (WRT_INSTALL_MODE_INSTALL_PRELOAD == installMode) {
-        return InstallMode::INSTALL_MODE_PRELOAD;
-    } else if (WRT_INSTALL_MODE_REINSTALL == installMode) {
-        return InstallMode::REINSTALL_MODE_DIRECTORY;
-    }
-    Assert(true && "wrong argument is inputed");
-    return InstallMode::WRONG_INSTALL_MODE;
-}
-
 static std::string cutOffFileName(const std::string& path)
 {
     size_t found = path.find_last_of("/");
@@ -102,7 +81,7 @@ static bool checkPaths()
     return if_ok;
 }
 
-EXPORT_API void wrt_installer_init(void *userdata,
+void wrt_installer_init(void *userdata,
                                   WrtInstallerInitCallback callback)
 {
     // Set DPL/LOG MID
@@ -164,7 +143,7 @@ EXPORT_API void wrt_installer_init(void *userdata,
     return;
 }
 
-EXPORT_API void wrt_installer_shutdown()
+void wrt_installer_shutdown()
 {
     try {
         LogInfo("[WRT-API] DEINITIALIZING WRT INSTALLER...");
@@ -189,19 +168,25 @@ EXPORT_API void wrt_installer_shutdown()
     }
 }
 
-EXPORT_API void wrt_install_widget(
+void wrt_install_widget(
     const char *path,
     void* userdata,
     WrtInstallerStatusCallback status_cb,
     WrtProgressCallback progress_cb,
-    WrtInstallMode installMode,
-    bool quiet,
+    InstallMode installMode,
     std::shared_ptr<PackageManager::
                         IPkgmgrSignal> pkgmgrInterface
     )
 {
     UNHANDLED_EXCEPTION_HANDLER_BEGIN
     {
+        if (InstallMode::InstallTime::PRELOAD == installMode.installTime) {
+            DPL::Log::OldStyleLogProvider *oldStyleProvider =
+                new DPL::Log::OldStyleLogProvider(false, false, false, true,
+                        false, true);
+            DPL::Log::LogSystemSingleton::Instance().AddProvider(oldStyleProvider);
+        }
+
         LogInfo("[WRT-API] INSTALL WIDGET: " << path);
         // Post installation event
         CONTROLLER_POST_EVENT(
@@ -212,14 +197,13 @@ EXPORT_API void wrt_install_widget(
                     InstallerCallbacksTranslate::installProgressCallback,
                     new InstallerCallbacksTranslate::StatusCallbackStruct(
                         userdata, status_cb, progress_cb),
-                    translateInstallMode(installMode),
-                    quiet,
+                    installMode,
                     pkgmgrInterface)));
     }
     UNHANDLED_EXCEPTION_HANDLER_END
 }
 
-EXPORT_API void wrt_uninstall_widget(
+void wrt_uninstall_widget(
     const char * const tzAppid,
     void* userdata,
     WrtInstallerStatusCallback status_cb,
@@ -249,7 +233,7 @@ EXPORT_API void wrt_uninstall_widget(
     UNHANDLED_EXCEPTION_HANDLER_END
 }
 
-EXPORT_API void wrt_install_plugin(
+void wrt_install_plugin(
     const char *pluginDir,
     void *user_param,
     WrtPluginInstallerStatusCallback status_cb,
@@ -277,7 +261,3 @@ EXPORT_API void wrt_install_plugin(
     }
     UNHANDLED_EXCEPTION_HANDLER_END
 }
-
-#ifdef __cplusplus
-}
-#endif