Simple update check mechanism, and tons of notification tweaking to make the notifications look less crap.

2018-02-08 01:26:09 -06:00
parent 30df7dacde
commit 2dc46964b4
12 changed files with 375 additions and 17 deletions
--- a/indra/newview/shupdatechecker.cpp
+++ b/indra/newview/shupdatechecker.cpp
@@ -0,0 +1,171 @@
+#include "llviewerprecompiledheaders.h"
+
+#include "llviewerwindow.h"
+#include "llwindow.h"
+#include "llpanelgeneral.h"
+#include "llappviewer.h"
+#include "llbutton.h"
+#include "llviewercontrol.h"
+#include "llnotificationsutil.h"
+#include "llstartup.h"
+#include "llviewerwindow.h"			// to link into child list
+#include "llnotify.h"
+#include "lluictrlfactory.h"
+#include "llhttpclient.h"
+#include "llversioninfo.h"
+#include "llbufferstream.h"
+#include "llweb.h"
+
+
+#include <jsoncpp/reader.h>
+
+extern AIHTTPTimeoutPolicy getUpdateInfoResponder_timeout;
+///////////////////////////////////////////////////////////////////////////////
+// GetUpdateInfoResponder
+class GetUpdateInfoResponder : public LLHTTPClient::ResponderWithCompleted
+{
+	LOG_CLASS(GetUpdateInfoResponder);
+
+public:
+	GetUpdateInfoResponder(std::string type)
+		: mType(type)
+	{}
+	void onNotifyButtonPress(const LLSD& notification, const LLSD& response, std::string name, std::string url)
+	{
+		S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
+		if (option == 0) // URL
+		{
+			std::string escaped_url = LLWeb::escapeURL(url);
+			if (gViewerWindow)
+			{
+				gViewerWindow->getWindow()->spawnWebBrowser(escaped_url, true);
+			}
+		}
+		if (option == 1) // Later
+		{}
+		else if (option == 2) // Ignore
+		{
+			LLNotificationPtr notifyptr = LLNotificationsUtil::find(notification["id"]);
+			if (notifyptr)
+			{
+				notifyptr->setIgnored(true);
+			}
+		}
+	}
+	/*virtual*/ void completedRaw(LLChannelDescriptors const& channels, buffer_ptr_t const& buffer)
+	{
+		LLBufferStream istr(channels, buffer.get());
+		std::stringstream strstrm;
+		strstrm << istr.rdbuf();
+		const std::string body = strstrm.str();
+
+		if (mStatus != HTTP_OK)
+		{
+			LL_WARNS() << "Failed to get update info (" << mStatus << ")" << LL_ENDL;
+			return;
+		}
+
+		Json::Value root;
+		Json::Reader reader;
+		if (!reader.parse(body, root))
+		{
+			LL_WARNS() << "Failed to parse update info: " << reader.getFormattedErrorMessages() << LL_ENDL;
+			return;
+		}
+
+		std::string viewer_version = llformat("%s (%i)", LLVersionInfo::getShortVersion(), LLVersionInfo::getBuild());
+
+		const Json::Value data = root[mType];
+#if LL_WINDOWS
+		std::string recommended_version = data["recommended"]["windows"].asString();
+		std::string minimum_version = data["minimum"]["windows"].asString();
+#elif LL_LINUX
+		std::string recommended_version = data["recommended"]["linux"].asString();
+		std::string minimum_version = data["minimum"]["linux"].asString();
+#elif LL_DARWIN
+		std::string recommended_version = data["recommended"]["apple"].asString();
+		std::string minimum_version = data["minimum"]["apple"].asString();
+#endif
+		
+		S32 minimum_build, recommended_build;
+		sscanf(recommended_version.c_str(), "%*i.%*i.%*i (%i)", &recommended_build);
+		sscanf(minimum_version.c_str(), "%*i.%*i.%*i (%i)", &minimum_build);
+
+		LL_INFOS() << LLVersionInfo::getBuild() << LL_ENDL;
+		LLSD args;
+		args["CURRENT_VER"] = viewer_version;
+		args["RECOMMENDED_VER"] = recommended_version;
+		args["MINIMUM_VER"] = minimum_version;
+		args["URL"] = data["url"].asString();
+		args["TYPE"] = mType == "release" ? "Viewer" : "Alpha";
+
+		static LLCachedControl<S32> sLastKnownReleaseBuild("SinguLastKnownReleaseBuild", 0);
+		static LLCachedControl<S32> sLastKnownAlphaBuild("SinguLastKnownAlphaBuild", 0);
+
+		LLCachedControl<S32>& lastver = mType == "release" ? sLastKnownReleaseBuild : sLastKnownAlphaBuild;
+
+		if (LLVersionInfo::getBuild() < minimum_build || LLVersionInfo::getBuild() < recommended_build)
+		{
+			if (lastver.get() < recommended_build)
+			{
+				lastver = recommended_build;
+				LLUI::sIgnoresGroup->setWarning("UrgentUpdateModal", true);
+				LLUI::sIgnoresGroup->setWarning("UrgentUpdate", true);
+				LLUI::sIgnoresGroup->setWarning("RecommendedUpdate", true);
+			}
+			std::string notificaiton;
+			if (LLVersionInfo::getBuild() < minimum_build)
+			{
+				if (LLUI::sIgnoresGroup->getWarning("UrgentUpdateModal"))
+				{
+					notificaiton = "UrgentUpdateModal";
+				}
+				else
+				{
+					notificaiton = "UrgentUpdate";
+				}
+			}
+			else if (LLVersionInfo::getBuild() < recommended_build)
+			{
+				notificaiton = "RecommendedUpdate";
+			}
+			if (!notificaiton.empty())
+			{
+				LLNotificationsUtil::add(notificaiton, args, LLSD(), boost::bind(&GetUpdateInfoResponder::onNotifyButtonPress, this, _1, _2, notificaiton, data["url"].asString()));
+			}
+		}	
+	}
+
+protected:
+	/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return getUpdateInfoResponder_timeout; }
+	/*virtual*/ char const* getName(void) const { return "GetUpdateInfoResponder"; }
+
+private:
+	std::string mType;
+};
+
+void check_for_updates()
+{
+#if LL_WINDOWS | LL_LINUX | LL_DARWIN
+	// Hard-code the update url for now.
+	std::string url = "http://singularity-viewer.github.io/pages/api/get_update_info.json";//gSavedSettings.getString("SHUpdateCheckURL");
+	if (!url.empty())
+	{
+		std::string type;
+		auto& channel = LLVersionInfo::getChannel();
+		if (channel == std::string("Singularity"))
+		{
+			type = "release";
+		}
+		else if (channel == std::string("Singularity Test") || channel == std::string("Singularity Alpha"))
+		{
+			type = "alpha";
+		}
+		else
+		{
+			return;
+		}
+		LLHTTPClient::get(url, new GetUpdateInfoResponder(type));
+	}
+#endif
+}