Combine StorageDirectories Steps

Combined step :
 - StepCreateStorageDirectories and StepCreatePerUserStorageDirectories
 - StepUpdateStorageDirectories and StepUpdatePerUserStorageDirectories
 - StepRecoverStorageDirectories and StepRecoverPerUserStorageDirectories

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/206075/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/206194/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/206193/

Change-Id: I2a23cede0e634a844868c8910e2440c0f34fd552
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 05bb788..373a984 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -23,7 +23,6 @@
 #include <common/step/filesystem/step_copy_tep.h>
 #include <common/step/filesystem/step_create_icons.h>
 #include <common/step/filesystem/step_create_globalapp_symlinks.h>
-#include <common/step/filesystem/step_create_per_user_storage_directories.h>
 #include <common/step/filesystem/step_create_storage_directories.h>
 #include <common/step/filesystem/step_delta_patch.h>
 #include <common/step/filesystem/step_disable_external_mount.h>
@@ -34,7 +33,6 @@
 #include <common/step/filesystem/step_recover_icons.h>
 #include <common/step/filesystem/step_recover_manifest.h>
 #include <common/step/filesystem/step_recover_external_storage.h>
-#include <common/step/filesystem/step_recover_per_user_storage_directories.h>
 #include <common/step/filesystem/step_recover_storage_directories.h>
 #include <common/step/filesystem/step_remove_files.h>
 #include <common/step/filesystem/step_remove_icons.h>
@@ -45,7 +43,6 @@
 #include <common/step/filesystem/step_remove_zip_image.h>
 #include <common/step/filesystem/step_remove_tep.h>
 #include <common/step/filesystem/step_unzip.h>
-#include <common/step/filesystem/step_update_per_user_storage_directories.h>
 #include <common/step/filesystem/step_update_storage_directories.h>
 #include <common/step/filesystem/step_update_tep.h>
 #include <common/step/mount/step_mount_install.h>
@@ -152,7 +149,6 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::filesystem::StepCreateIcons>();
   AddStep<wgt::filesystem::StepCopyPreviewIcons>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
   AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
@@ -168,7 +164,7 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -207,7 +203,6 @@ void HybridInstaller::UpdateSteps() {
   AddStep<ci::filesystem::StepAcquireExternalStorage>(true);
   AddStep<ci::backup::StepCopyBackup>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<ci::filesystem::StepCreateIcons>();
@@ -229,7 +224,7 @@ void HybridInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -304,7 +299,6 @@ void HybridInstaller::DeltaSteps() {
   AddStep<ci::filesystem::StepAcquireExternalStorage>(true);
   AddStep<ci::backup::StepCopyBackup>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<ci::filesystem::StepCreateIcons>();
@@ -326,7 +320,7 @@ void HybridInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -341,7 +335,6 @@ void HybridInstaller::RecoverySteps() {
   AddStep<ci::filesystem::StepRecoverIcons>();
   AddStep<ci::filesystem::StepRecoverManifest>();
   AddStep<ci::filesystem::StepRecoverExternalStorage>();
-  AddStep<ci::filesystem::StepRecoverPerUserStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverFiles>();
   AddStep<ci::mount::StepMountRecover>();
@@ -386,7 +379,6 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::filesystem::StepCreateIcons>();
   AddStep<wgt::filesystem::StepCopyPreviewIcons>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::pkgmgr::StepGenerateXml>();
   AddStep<hybrid::pkgmgr::StepMergeXml>();
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
@@ -402,7 +394,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -441,7 +433,6 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::mount::StepMountUpdate>();
   AddStep<tpk::filesystem::StepTpkUpdatePackageDirectory>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<tpk::filesystem::StepTpkPatchIcons>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<ci::filesystem::StepCreateIcons>();
@@ -462,7 +453,7 @@ void HybridInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -501,7 +492,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -544,7 +535,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -570,7 +561,7 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -600,7 +591,7 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -677,7 +668,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index f1daad4..32d0539 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -26,7 +26,6 @@
 #include <common/step/filesystem/step_copy_tep.h>
 #include <common/step/filesystem/step_create_icons.h>
 #include <common/step/filesystem/step_create_globalapp_symlinks.h>
-#include <common/step/filesystem/step_create_per_user_storage_directories.h>
 #include <common/step/filesystem/step_create_storage_directories.h>
 #include <common/step/filesystem/step_delta_patch.h>
 #include <common/step/filesystem/step_disable_external_mount.h>
@@ -40,7 +39,6 @@
 #include <common/step/filesystem/step_recover_manifest.h>
 #include <common/step/filesystem/step_recover_external_storage.h>
 #include <common/step/filesystem/step_recover_storage_directories.h>
-#include <common/step/filesystem/step_recover_per_user_storage_directories.h>
 #include <common/step/filesystem/step_remove_files.h>
 #include <common/step/filesystem/step_remove_icons.h>
 #include <common/step/filesystem/step_remove_globalapp_symlinks.h>
@@ -50,7 +48,6 @@
 #include <common/step/filesystem/step_remove_user_data.h>
 #include <common/step/filesystem/step_remove_zip_image.h>
 #include <common/step/filesystem/step_unzip.h>
-#include <common/step/filesystem/step_update_per_user_storage_directories.h>
 #include <common/step/filesystem/step_update_storage_directories.h>
 #include <common/step/filesystem/step_update_tep.h>
 #include <common/step/mount/step_check_mount_path.h>
@@ -154,7 +151,6 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::filesystem::StepCopy>();
   AddStep<ci::filesystem::StepCopyTep>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::filesystem::StepCreateSymbolicLink>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<ci::filesystem::StepCreateIcons>();
@@ -169,7 +165,7 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -207,7 +203,6 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::security::StepRevokeTrustAnchor>();
   AddStep<ci::backup::StepCopyBackup>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<wgt::filesystem::StepCreateSymbolicLink>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
@@ -224,7 +219,7 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -326,7 +321,6 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::security::StepRevokeTrustAnchor>();
   AddStep<ci::backup::StepCopyBackup>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<wgt::filesystem::StepCreateSymbolicLink>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
@@ -343,7 +337,7 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -360,7 +354,6 @@ void WgtInstaller::RecoverySteps() {
   AddStep<ci::filesystem::StepRecoverManifest>();
   AddStep<ci::filesystem::StepRecoverExternalStorage>();
   AddStep<ci::filesystem::StepRecoverStorageDirectories>();
-  AddStep<ci::filesystem::StepRecoverPerUserStorageDirectories>();
   AddStep<ci::filesystem::StepRecoverGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepRecoverFiles>();
   AddStep<ci::mount::StepMountRecover>();
@@ -398,7 +391,6 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<wgt::filesystem::StepWgtPreparePackageDirectory>();
   AddStep<ci::filesystem::StepCopyTep>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
-  AddStep<ci::filesystem::StepCreateStorageDirectories>();
   AddStep<wgt::filesystem::StepCreateSymbolicLink>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
   AddStep<ci::filesystem::StepCreateIcons>();
@@ -413,7 +405,7 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -449,7 +441,6 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::mount::StepMountUpdate>();
   AddStep<wgt::filesystem::StepWgtUpdatePackageDirectory>();
   AddStep<ci::filesystem::StepUpdateTep>();
-  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
   AddStep<wgt::filesystem::StepCreateSymbolicLink>();
   AddStep<wgt::filesystem::StepWgtPatchIcons>();
@@ -465,7 +456,7 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -496,7 +487,7 @@ void WgtInstaller::ManifestDirectInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -533,7 +524,7 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -638,7 +629,7 @@ void WgtInstaller::ManifestPartialInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
+  AddStep<ci::filesystem::StepCreateStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -665,7 +656,7 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
+  AddStep<ci::filesystem::StepUpdateStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }