From 16b986a76af05a15151aa9da67ab87d07da26298 Mon Sep 17 00:00:00 2001 From: Ken Van Hoeylandt Date: Sun, 21 Sep 2025 22:50:52 +0200 Subject: [PATCH] Cleanup --- Tactility/Source/app/AppInstall.cpp | 5 ----- Tactility/Source/app/AppManifestParsing.cpp | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/Tactility/Source/app/AppInstall.cpp b/Tactility/Source/app/AppInstall.cpp index d3e55ade..a0b9e2ff 100644 --- a/Tactility/Source/app/AppInstall.cpp +++ b/Tactility/Source/app/AppInstall.cpp @@ -174,8 +174,6 @@ bool install(const std::string& path) { return false; } - TT_LOG_I(TAG, "1"); - target_path_lock.lock(); const std::string renamed_target_path = std::format("{}/{}", app_parent_path, manifest.appId); if (file::isDirectory(renamed_target_path)) { @@ -187,7 +185,6 @@ bool install(const std::string& path) { } target_path_lock.unlock(); - TT_LOG_I(TAG, "2"); target_path_lock.lock(); if (rename(app_target_path.c_str(), renamed_target_path.c_str()) != 0) { TT_LOG_E(TAG, "Failed to rename \"%s\" to \"%s\"", app_target_path.c_str(), manifest.appId.c_str()); @@ -198,10 +195,8 @@ bool install(const std::string& path) { manifest.appLocation = Location::external(renamed_target_path); - TT_LOG_I(TAG, "3"); addApp(manifest); - TT_LOG_I(TAG, "4"); return true; } diff --git a/Tactility/Source/app/AppManifestParsing.cpp b/Tactility/Source/app/AppManifestParsing.cpp index 3cc7c230..448869d1 100644 --- a/Tactility/Source/app/AppManifestParsing.cpp +++ b/Tactility/Source/app/AppManifestParsing.cpp @@ -64,55 +64,45 @@ bool parseManifest(const std::map& map, AppManifest& m return false; } - TT_LOG_I(TAG, "a"); - if (!isValidManifestVersion(manifest.manifestVersion)) { TT_LOG_E(TAG, "Invalid version"); return false; } - TT_LOG_I(TAG, "b"); // [app] if (!getValueFromManifest(map, "[app]id", manifest.appId)) { return false; } - TT_LOG_I(TAG, "c"); if (!isValidId(manifest.appId)) { TT_LOG_E(TAG, "Invalid app id"); return false; } - TT_LOG_I(TAG, "d"); if (!getValueFromManifest(map, "[app]name", manifest.appName)) { return false; } - TT_LOG_I(TAG, "e"); if (!isValidName(manifest.appName)) { TT_LOG_I(TAG, "Invalid app name"); return false; } - TT_LOG_I(TAG, "f"); if (!getValueFromManifest(map, "[app]versionName", manifest.appVersionName)) { return false; } - TT_LOG_I(TAG, "g"); if (!isValidAppVersionName(manifest.appVersionName)) { TT_LOG_E(TAG, "Invalid app version name"); return false; } - TT_LOG_I(TAG, "h"); std::string version_code_string; if (!getValueFromManifest(map, "[app]versionCode", version_code_string)) { return false; } - TT_LOG_I(TAG, "i"); if (!isValidAppVersionCode(version_code_string)) { TT_LOG_E(TAG, "Invalid app version code"); return false; @@ -122,17 +112,14 @@ bool parseManifest(const std::map& map, AppManifest& m // [target] - TT_LOG_I(TAG, "j"); if (!getValueFromManifest(map, "[target]sdk", manifest.targetSdk)) { return false; } - TT_LOG_I(TAG, "k"); if (!getValueFromManifest(map, "[target]platforms", manifest.targetPlatforms)) { return false; } - TT_LOG_I(TAG, "l"); // Defaults manifest.appCategory = Category::User;