Remove the commented code

[platform/core/dotnet/launcher.git] / NativeLauncher / installer-plugin / prefer_nuget_cache_plugin.cc

diff --git a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
index 6e3e2c3..9879683 100644 (file)
--- a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
+++ b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
@@ -46,7 +46,7 @@ typedef struct Metadata {
        const char *value;
 } Metadata;
 
-std::vector<std::string> nugetPackagesAssembliesShaR2R;
+std::vector<std::string> nugetPackagesAssembliesSha;
 std::vector<std::string> tacDB;
 std::vector<std::string> createDirectories;
 std::vector<std::string> updateTac;
@@ -148,8 +148,8 @@ void SHA256(std::string path, char outputBuffer[65])
 int depsJsonParser()
 {
        std::string deps_json_name = execName.substr(0, execName.rfind(".dll")) + ".deps.json";
-       if (bf::exists(concatPath(rootPath, deps_json_name))) {
-               std::string deps_json_path = concatPath(rootPath, deps_json_name);
+       std::string deps_json_path = concatPath(rootPath, deps_json_name);
+       if (bf::exists(deps_json_path)) {
                std::ifstream ifs(deps_json_path);
                Json::CharReaderBuilder reader;
                Json::Value root;
@@ -172,23 +172,23 @@ int depsJsonParser()
                                        const Json::Value assemblies = nugetPackages[nuget.c_str()]["runtime"];
                                        if (assemblies != Json::nullValue) {
                                                const Json::Value dependencies = nugetPackages[nuget.c_str()]["dependencies"];
-                                               std::string r2r = "";
+                                               bool isDependency = false;
                                                for (auto& dependency : dependencies.getMemberNames()) {
                                                        if (strstr(dependency.c_str(), TIZEN_DOTNET_NUGET) != NULL ||
                                                                strstr(dependency.c_str(), NET_STANDARD_LIBRARY_NUGET) != NULL) {
                                                                continue;
                                                        } else {
-                                                               r2r = "--r2r";
+                                                               isDependency = true;
                                                        }
                                                }
-                                               if (strcmp(r2r.c_str(), "--r2r") != 0) {
+                                               if (!isDependency) {
                                                        tacDB.push_back(nuget);
                                                        _INFO("Nuget package : %s", nuget.c_str());
                                                        for (auto& assembly : assemblies.getMemberNames()) {
                                                                std::string assembly_name = assembly.substr(assembly.rfind('/') + 1);
                                                                char buffer[65] = {0};
                                                                SHA256(concatPath(binPath, assembly_name), buffer);
-                                                               nugetPackagesAssembliesShaR2R.push_back(nuget + "/" + assembly_name + "/" + buffer + "/" + r2r);
+                                                               nugetPackagesAssembliesSha.push_back(nuget + "/" + assembly_name + "/" + buffer);
                                                                _INFO("Assembly / SHA256 : %s / %s", assembly_name.c_str(), buffer);
                                                        }
                                                }
@@ -210,18 +210,15 @@ int createSymlink(std::string tac_version_dir, std::string np)
                return -1;
        }
 
-       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-               std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-               std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                        if (bf::exists(concatPath(binPath, assembly))) {
                                if (isCreateDirectory) {
                                        if (!copyFile(concatPath(binPath, assembly), concatPath(tac_version_dir, assembly))) {
-                                               _ERR("Failed to move of %s", assembly.c_str());
+                                               _ERR("Failed to copy of %s", assembly.c_str());
                                                return -1;
                                        }
                                }
@@ -303,13 +300,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        createDirectories.push_back(tac_version_dir);
                        std::ofstream ofs(sha256_info, std::ios::app);
                        int assembly_count = 0;
-                       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                               std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                               std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                               std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                        ofs << assembly << ";" << sha << std::endl;
                                        assembly_count++;
@@ -330,13 +325,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        int compare_count = 0;
                        int assembly_count = 0;
                        std::string sha256_count = "0";
-                       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                               std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                               std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                               std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                        assembly_count++;
                                        std::ifstream ifs(sha256_info);
@@ -354,7 +347,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        }
                        if (!strcmp(std::to_string(assembly_count).c_str(), std::to_string(compare_count).c_str()) &&
                                !strcmp(std::to_string(assembly_count).c_str(), sha256_count.c_str())) {
-                               _INFO("Same : %s", tac_name.c_str());
+                               _INFO("Same nuget : %s", tac_name.c_str());
                                if (createSymlink(tac_version_dir, np) < 0) {
                                        _ERR("Failed to create symlink");
                                        return -1;
@@ -363,7 +356,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                                                "VALUES ('" + std::string(pkgId) + "', '" + np + "', '" + tac_name + "', '" + tac_version + "');";
                                dbInsert(tac_db, TAC_APP_LIST_DB, sql);
                        } else {
-                               _INFO("Different : %s", tac_name.c_str());
+                               _INFO("Different nuget : %s", tac_name.c_str());
                        }
                }
                if (!bf::exists(sha256_info)) {
@@ -375,7 +368,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
        return 0;
 }
 
-static int sqliteCb(void *count, int argc, char **argv, char **azColName) {
+static int sqliteCb(void *count, int argc, char **argv, char **colName) {
        int *c = (int*)count;
        *c = atoi(argv[0]);
        return 0;
@@ -384,7 +377,6 @@ static int sqliteCb(void *count, int argc, char **argv, char **azColName) {
 int updateTacDB(const char *pkgId)
 {
        for (auto& unp : updateTac) {
-               int ret;
                int count = -1;
                if (tac_db) {
                        if (!dbOpen(tac_db, TAC_APP_LIST_DB)) {
@@ -396,7 +388,7 @@ int updateTacDB(const char *pkgId)
                        return -1;
                }
                std::string sql = "SELECT COUNT(NUGET) FROM TAC WHERE NUGET = '" + unp + "';";
-               ret = sqlite3_exec(tac_db, sql.c_str(), sqliteCb, &count, NULL);
+               int ret = sqlite3_exec(tac_db, sql.c_str(), sqliteCb, &count, NULL);
                if (ret != SQLITE_OK) {
                        _ERR("Sqlite select error");
                        return -1;
@@ -485,13 +477,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                createDirectories.push_back(tac_version_dir);
                                std::ofstream ofs2(sha256_info, std::ios::app);
                                int assembly_count = 0;
-                               for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                                       std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                                       std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                                       std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                               for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                                       std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                        std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                        std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                                       std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                                       std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                        if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                                ofs2 << assembly << ";" << sha << std::endl;
                                                assembly_count++;
@@ -524,13 +514,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                int compare_count = 0;
                                int assembly_count = 0;
                                std::string sha256_count = "0";
-                               for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                                       std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                                       std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                                       std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                               for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                                       std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                        std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                        std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                                       std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                                       std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                        if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                                assembly_count++;
                                                std::ifstream ifs2(sha256_info);
@@ -549,7 +537,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
 
                                if (!strcmp(std::to_string(assembly_count).c_str(), std::to_string(compare_count).c_str()) &&
                                        !strcmp(std::to_string(assembly_count).c_str(), sha256_count.c_str())) {
-                                       _INFO("Same : %s", tac_name.c_str());
+                                       _INFO("Same nuget : %s", tac_name.c_str());
                                        if (createSymlink(tac_version_dir, np) < 0) {
                                                _ERR("Failed to create symlink");
                                                return -1;
@@ -571,7 +559,7 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                                dbInsert(tac_db, TAC_APP_LIST_DB, sql);
                                        }
                                } else {
-                                       _INFO("Different : %s", tac_name.c_str());
+                                       _INFO("Different nuget : %s", tac_name.c_str());
                                }
                        }
                        if (!bf::exists(sha256_info)) {