Accounts Parser implemented

Change-Id: I9cd6e51daad20b7c62cbb19b5691191679bd53d4
Signed-off-by: Dongeup Ham <dongeup.ham@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index cc22d59..f8c2331 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -21,7 +21,7 @@
 #ifndef _INSTALLER_DEFS_H_
 #define _INSTALLER_DEFS_H_
 
-#define OSP_INSTALLER_VERSION "osp-installer version=20130108.1"
+#define OSP_INSTALLER_VERSION "osp-installer version=20130109.1"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Manager/InstallerManager.cpp b/src/Manager/InstallerManager.cpp
index d789949..1f19b3c 100755 (executable)
--- a/src/Manager/InstallerManager.cpp
+++ b/src/Manager/InstallerManager.cpp
@@ -25,6 +25,7 @@
 #include <FIoDirectory.h>
 #include <FBase_StringConverter.h>
 #include <FAppPkg_PackageInfoImpl.h>
+#include <FSysSystemTime.h>
 
 #include "InstallerManager.h"
 #include "GuestInstaller.h"
@@ -48,6 +49,8 @@ InstallerManager::InstallerManager(void)
 ,__pInstaller(null)
 ,__errorType(0)
 ,__operation(INSTALLER_OPERATION_INSTALL)
+,__startTick(0)
+,__endTick(0)
 {
 }
 
@@ -322,6 +325,8 @@ InstallerManager::Request(const String& path, InstallerOperation operation, Requ
        InstallerManager* pInstallManager = null;
        PackageId packageId;
 
+       Tizen::System::SystemTime::GetTicks(__startTick);
+
        AppLogTag(OSP_INSTALLER, "------------------------------------------");
        AppLogTag(OSP_INSTALLER, "InstallerManager::Request");
        AppLogTag(OSP_INSTALLER, "------------------------------------------");
@@ -734,7 +739,6 @@ InstallerManager::PrintPackageInfo(const char* appId)
        AppLogTag(OSP_INSTALLER, "------------------------------------------");
        AppLogTag(OSP_INSTALLER, "# id = [%S]",  pPackageInfoImpl->GetId().GetPointer());
        AppLogTag(OSP_INSTALLER, "# version = [%S]", pPackageInfoImpl->GetAppVersion().GetPointer());
-       AppLogTag(OSP_INSTALLER, "# secret = [%S]", pPackageInfoImpl->GetAppSecret().GetPointer());
        AppLogTag(OSP_INSTALLER, "# name = [%S]", pPackageInfoImpl->GetAppName().GetPointer());
        AppLogTag(OSP_INSTALLER, "# vendor = [%S]", pPackageInfoImpl->GetAppVendor().GetPointer());
        AppLogTag(OSP_INSTALLER, "# description = [%S]", pPackageInfoImpl->GetAppDescription().GetPointer());
@@ -786,16 +790,20 @@ InstallerManager::PrintResult(void)
        int errorType = GetErrorType();
        InstallerOperation operation = GetInstallerOperation();
 
+       Tizen::System::SystemTime::GetTicks(__endTick);
+
        AppLogTag(OSP_INSTALLER, "==========================================");
        AppLogTag(OSP_INSTALLER, "%s Result", (operation == INSTALLER_OPERATION_INSTALL)?"Installation":"Uninstallation");
        AppLogTag(OSP_INSTALLER, " # %s", OSP_INSTALLER_VERSION);
        AppLogTag(OSP_INSTALLER, " # AppId     = [%ls], errorType = [%d]", appId.GetPointer(), errorType);
        AppLogTag(OSP_INSTALLER, " # result    = [%s]", (errorType == 0)?"Success":"Failure");
+       AppLogTag(OSP_INSTALLER, " # operation time = [%d](start=%d, end=%d)", (int)(__endTick-__startTick), (int)__startTick, (int)__endTick);
        AppLogTag(OSP_INSTALLER, "==========================================");
 
        fprintf(stderr, " # AppId     = [%ls], errorType = [%d]\n", appId.GetPointer(), errorType);
        fprintf(stderr, " # operation = [%s]\n", (operation == INSTALLER_OPERATION_INSTALL)?"Installation":"Uninstallation");
        fprintf(stderr, " # result    = [%s]\n", (errorType == 0)?"Success":"Failure");
+       fprintf(stderr, " # operation time = [%d] ms(start=%d, end=%d)\n", (int)(__endTick-__startTick), (int)__startTick, (int)__endTick);
 }
 
 const PackageId&

diff --git a/src/Manager/InstallerManager.h b/src/Manager/InstallerManager.h
index 4e458e4..798944b 100755 (executable)
--- a/src/Manager/InstallerManager.h
+++ b/src/Manager/InstallerManager.h
@@ -95,6 +95,9 @@ private:
        int __errorType;
        InstallerOperation __operation;
 
+       long long __startTick;
+       long long __endTick;
+
 }; // InstallerManager
 
 #endif //_INSTALLER_MANAGER_H_

diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp
index 4afee3a..36363bc 100755 (executable)
--- a/src/XmlHandler/ManifestGenerator.cpp
+++ b/src/XmlHandler/ManifestGenerator.cpp
@@ -642,6 +642,8 @@ ManifestGenerator::WriteApp(int index, Tizen::App::Package::_PackageAppInfoImpl*
                WriteLiveboxes(pAppInfoImpl);
        }
 
+       WriteAccounts(index);
+
        return true;
 }
 
@@ -771,3 +773,68 @@ ManifestGenerator::WriteAppControl(int index)
        return true;
 }
 
+bool
+ManifestGenerator::WriteAccounts(int index)
+{
+       _PackageInfoImpl *pPackageInfoImpl = __pContext->GetPackageInfoImpl();
+
+       IListT<AppData*>* pAppDataList = __pContext->__pAppDataList;
+       TryReturn(pAppDataList, false, "[osp-installer] pAppDataList is null");
+
+       AppData* pAppData = null;
+       pAppDataList->GetAt(index, pAppData);
+       TryReturn(pAppData, false, "[osp-installer] pAppData is null");
+
+       IListT<AccountData*>* pAccountDataList = pAppData->__pAccountDataList;
+       TryReturn(pAccountDataList, false, "[osp-installer] pAccountDataList is null");
+
+       int accountCount = pAccountDataList->GetCount();
+       if (accountCount == 0)
+       {
+               return true;
+       }
+
+       __pWriter->StartElement("Accounts");
+
+       for (int i = 0; i < accountCount; i++)
+       {
+               __pWriter->StartElement("AccountProvider");
+
+               AccountData* pAccountData = null;
+               pAccountDataList->GetAt(i, pAccountData);
+               TryReturn(pAccountData, false, "[osp-installer] pAccountData is null");
+
+               __pWriter->WriteAttribute("ProviderId", pAccountData->__providerId);
+               __pWriter->WriteAttribute("MultipleAccountsSupport", pAccountData->__multipleAccountsSupport);
+
+               String accountIcon = pAccountData->__accountIcon;
+               if (accountIcon.IsEmpty() == false)
+               {
+                       String accountIconPath;
+                       accountIconPath.Format(1024, L"%ls%ls/%ls", pPackageInfoImpl->GetAppRootPath().GetPointer(), DIR_SHARED_RES, accountIcon.GetPointer());
+
+                       __pWriter->StartElement("account-icon");
+                       __pWriter->WriteString(accountIconPath);
+                       __pWriter->EndElement();
+               }
+
+               String accountSmallIcon = pAccountData->__accountSmallIcon;
+               if (accountSmallIcon.IsEmpty() == false)
+               {
+                       String accountSmallIconPath;
+                       accountSmallIconPath.Format(1024, L"%ls%ls/%ls", pPackageInfoImpl->GetAppRootPath().GetPointer(), DIR_SHARED_RES, accountSmallIcon.GetPointer());
+
+                       __pWriter->StartElement("account-small-icon");
+                       __pWriter->WriteString(accountSmallIcon);
+                       __pWriter->EndElement();
+               }
+
+               WriteLanguageValue(pAccountData->__pNameList, L"label");
+
+               __pWriter->EndElement();        // end of "AccountProvider"
+       }
+
+       __pWriter->EndElement();        // end of "Accounts"
+
+       return true;
+}

diff --git a/src/XmlHandler/ManifestGenerator.h b/src/XmlHandler/ManifestGenerator.h
index 2394feb..7429dfd 100755 (executable)
--- a/src/XmlHandler/ManifestGenerator.h
+++ b/src/XmlHandler/ManifestGenerator.h
@@ -62,6 +62,7 @@ private:
        bool WriteApp(int index, Tizen::App::Package::_PackageAppInfoImpl* pAppInfoImpl);
        bool WriteSubModeApp(int index);
        bool WriteAppControl(int index);
+       bool WriteAccounts(int index);
 
 private:
        InstallationContext* __pContext;