refactor(zupdater): extract getting next release and installing to functions

Author: connorjclark

src/zupdater/zupdater.cpp

@@ -15,6 +15,9 @@
 namespace fs = std::filesystem;
 
 static bool headless;
+static std::string repo = getRepo();
+static std::string channel = getReleaseChannel();
+static std::string current_version = getReleaseTag();
 
 std::ofstream out("updater.log", std::ios::binary);
 
@@ -104,30 +107,17 @@ static bool is_in_osx_application_bundle()
 #endif
 }
 
-int32_t main(int32_t argc, char* argv[])
+static void require_python()
 {
-	common_main_setup(App::updater, argc, argv);
-
-	bool cache = used_switch(argc, argv, "-cache") > 0;
-	headless = used_switch(argc, argv, "-headless") > 0;
-
-#ifdef __APPLE__
-	if (!is_in_osx_application_bundle() && argc > 0)
-	{
-        chdir(fs::path(argv[0]).parent_path().c_str());
-    }
-#endif
-
 	std::string py_version = get_output(PYTHON, {"--version"}, "Python3 is required to run the updater");
 	if (!py_version.starts_with("Python 3"))
 	{
 		fatal("Python3 is required, but found " + py_version);
 	}
+}
 
-	std::string repo = getRepo();
-	std::string channel = getReleaseChannel();
-	std::string current_version = getReleaseTag();
-
+static std::tuple<std::string, std::string> get_next_release()
+{
 	auto [next_release_output, next_release_map] = get_output_map(PYTHON, {
 		"tools/updater.py",
 		"--repo", repo,
@@ -140,27 +130,18 @@ int32_t main(int32_t argc, char* argv[])
 	}
 	std::string new_version = next_release_map["tag_name"];
 	std::string asset_url = next_release_map["asset_url"];
+	return {new_version, asset_url};
+}
 
-	if (current_version == new_version)
-	{
-		std::string msg = fmt::format("Already on latest version: {}. Would you like to continue anyway?", new_version);
-		if (!prompt(msg))
-			return 0;
-	}
-	else
-	{
-		std::string msg = fmt::format("Would you like to upgrade from {} to {}? This should take less than a minute.", current_version, new_version);
-		if (!prompt(msg))
-			return 0;
-	}
-
+static bool install_release(std::string asset_url, bool use_cache, std::string& error)
+{
 	std::vector<std::string> args = {
 		"tools/updater.py",
 		"--repo", repo,
 		"--channel", channel,
 		"--asset-url", asset_url,
 	};
-	if (cache) args.push_back("--cache");
+	if (use_cache) args.push_back("--cache");
 	auto updater_output = get_output(PYTHON, args);
 	if (updater_output.empty())
 	{
@@ -169,10 +150,52 @@ int32_t main(int32_t argc, char* argv[])
 	printf("updater.py:\n%s\n", updater_output.c_str());
 
 	bool success = updater_output.find("success!") != std::string::npos;
+	if (!success)
+		error = updater_output;
+	return success;
+}
+
+int32_t main(int32_t argc, char* argv[])
+{
+	common_main_setup(App::updater, argc, argv);
+
+	bool cache = used_switch(argc, argv, "-cache") > 0;
+	headless = used_switch(argc, argv, "-headless") > 0;
+
+#ifdef __APPLE__
+	if (!is_in_osx_application_bundle() && argc > 0)
+	{
+        chdir(fs::path(argv[0]).parent_path().c_str());
+    }
+#endif
+
+	require_python();
+
+	auto [new_version, asset_url] = get_next_release();
+	if (new_version.empty() || asset_url.empty())
+	{
+		fatal("Could not find next version");
+	}
+
+	if (current_version == new_version)
+	{
+		std::string msg = fmt::format("Already on latest version: {}. Would you like to continue anyway?", new_version);
+		if (!prompt(msg))
+			return 0;
+	}
+	else
+	{
+		std::string msg = fmt::format("Would you like to upgrade from {} to {}? This should take less than a minute.", current_version, new_version);
+		if (!prompt(msg))
+			return 0;
+	}
+
+	std::string error;
+	bool success = install_release(asset_url, cache, error);
 	if (success)
 		done("Done!");
 	else
-		fatal("Failed: " + updater_output);
+		fatal("Failed: " + error);
 
 	return 0;
 }