Release/1.0.0 rc6 (#18)

* Modifies helper app to only bring main OBS window to foreground.
* Adds update check and dialog.
* Disables logout button while products are loading, to prevent null pointer issues.
* Backs up current scene collection json file before switching to new scene collection.
* Updates menu items names.
* Misc UI updates.

Author: FiniteSingularity

CMakeLists.txt

@@ -75,6 +75,8 @@ target_sources(
           src/elgato-cloud-config.hpp
           src/elgato-cloud-window.cpp
           src/elgato-cloud-window.hpp
+          src/elgato-update-modal.cpp
+          src/elgato-update-modal.hpp
           src/elgato-widgets.cpp
           src/elgato-widgets.hpp)
 

buildspec.json

@@ -41,8 +41,8 @@
     "versionMajor": 1,
     "versionMinor": 0,
     "versionPatch": 0,
-    "buildNumber": 123,
-    "releaseType": "rc5",
+    "buildNumber": 0,
+    "releaseType": "rc6",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

data/locale/en-US.ini

@@ -43,13 +43,14 @@ ExportWizard.RequiredPlugins.Title="Add required plugins"
 ExportWizard.RequiredPlugins.Text="Select any plugins needed to run this asset"
 ExportWizard.RequiredPlugins.NoPluginsFound="No installed plugins found."
 ExportWizard.ExportComplete.Title="Export complete"
-ExportWizard.ExportComplete.Text="Bundle successfully exported. Click 'Done' below to close this window."
+ExportWizard.ExportComplete.Text="Your scene collection is now ready to test or upload to Marketplace."
 ExportWizard.Exporting.Title="Exporting Bundle..."
 ExportWizard.Exporting.Text="Note: this can take a few minutes for scene collections with large files."
 SetupWizard.WindowTitle="Install Scene Collection"
 SetupWizard.NextButton="Continue"
 SetupWizard.BackButton="Back"
-SetupWizard.StartInstall.Title="Start install"
+SetupWizard.GetStartedButton="Get started"
+SetupWizard.StartInstall.Title="Just a few quick steps and\nyour setup is ready to use"
 SetupWizard.MissingPlugins.Title="You're missing something"
 SetupWizard.MissingPlugins.Text="To continue, download the following free plugins, then restart OBS and try again"
 SetupWizard.MissingPlugins.DownloadButton="Get"
@@ -64,4 +65,10 @@ SetupWizard.AudioSetup.Device.Text="Select a microphone"
 SetupWizard.Loading.Title="Loading Collection..."
 SetupWizard.Loading.Text="Note: this can take some time for scene collections with large files."
 SetupWizard.IncompatibleFile.Title="Incompatible file"
-SetupWizard.IncompatibleFile.Text="Error: This download did not contain a valid bundleInfo.json file and cannot be installed. (note: this is a problem with the submitted scene collection file on the server)"
+SetupWizard.IncompatibleFile.Text="Error: This download did not contain a valid bundleInfo.json file and cannot be installed. (note: this is a problem with the submitted scene collection file on the server)"
+
+UpdateModal.Title="Update available"
+UpdateModal.SkipVersionButton="Skip this verison"
+UpdateModal.LaterButton="Remind me later"
+UpdateModal.DownloadUpdateButton="Download Update"
+UpdateModal.Description="A new version of the Marketplace Direct to OBS is available to download, please download to maintain functionality!

loader/main.cpp

@@ -3,8 +3,9 @@
 #include <tlhelp32.h>
 #include <algorithm>
 
-#define BUFFER_SIZE 8000
+#include <iostream>
 
+#define BUFFER_SIZE 8000
 
 void ToLowerCase(std::wstring& str) {
 	std::transform(str.begin(), str.end(), str.begin(), ::towlower);
@@ -17,22 +18,22 @@ bool IsObs64Running() {
 		return false;  // Failed to take snapshot
 	}
 
-	PROCESSENTRY32 pe32;
-	pe32.dwSize = sizeof(PROCESSENTRY32);
+	PROCESSENTRY32 processEntry;
+	processEntry.dwSize = sizeof(PROCESSENTRY32);
 
 	// Start iterating through processes
-	if (Process32First(hProcessSnap, &pe32)) {
+	if (Process32First(hProcessSnap, &processEntry)) {
 		do {
 			// Convert the process name to lowercase for comparison
-			std::wstring processName(pe32.szExeFile);
+			std::wstring processName(processEntry.szExeFile);
 			ToLowerCase(processName);
 
 			// Compare process name to "obs64.exe" in lowercase
 			if (processName == L"obs64.exe") {
 				CloseHandle(hProcessSnap);
 				return true;  // obs64.exe is running
 			}
-		} while (Process32Next(hProcessSnap, &pe32));  // Move to next process
+		} while (Process32Next(hProcessSnap, &processEntry));  // Move to next process
 	}
 
 	CloseHandle(hProcessSnap);
@@ -71,10 +72,15 @@ BOOL CALLBACK WindowToForeground(HWND hwnd, LPARAM lParam) {
 	GetWindowThreadProcessId(hwnd, &processId);
 
 	if (processId == lParam) {
+		wchar_t windowTitle[256];
+		int titleLength = GetWindowTextW(hwnd, windowTitle, sizeof(windowTitle) / sizeof(wchar_t));
+		std::wstring title = windowTitle;
 		// Bring the window to the foreground
-		SetForegroundWindow(hwnd);
-		ShowWindow(hwnd, SW_RESTORE);  // Restore if minimized
-		return FALSE;  // Stop enumerating windows (we found the window)
+		if (title.rfind(L"OBS ", 0) == 0) { // the main OBS window title starts with 'OBS '
+			SetForegroundWindow(hwnd);
+			ShowWindow(hwnd, SW_RESTORE);
+			return FALSE;  // Stop enumerating windows (we found the window)
+		}
 	}
 	return TRUE;  // Continue enumerating windows
 }

src/elgato-cloud-data.cpp

@@ -29,10 +29,12 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QThread>
 #include <QMetaObject>
 #include <QDir>
+#include <QVersionNumber>
 
 #include <plugin-support.h>
 #include "elgato-cloud-window.hpp"
 #include "elgato-cloud-data.hpp"
+#include "elgato-update-modal.hpp"
 #include "platform.h"
 #include "util.h"
 #include "api.hpp"
@@ -284,6 +286,44 @@ void ElgatoCloud::LogOut()
 	}
 }
 
+void ElgatoCloud::CheckUpdates(bool forceCheck)
+{
+	try {
+		std::string updateUrl = "https://gc-updates.elgato.com/windows/marketplace-plugin-for-obs/final/app-version-check.json.php";
+		auto response = fetch_string_from_get(updateUrl, "");
+		blog(LOG_INFO, response.c_str());
+		auto responseJson = nlohmann::json::parse(response);
+		if (responseJson.contains("Automatic")) {
+			auto details = responseJson["Automatic"];
+			std::string version = details["Version"];
+			std::string downloadUrl = details["downloadURL"];
+			auto updateVersion = QVersionNumber::fromString(version);
+			auto currentVersion = QVersionNumber::fromString(PLUGIN_VERSION);
+			std::string skip = _skipUpdate == "" ? "0.0.0" : _skipUpdate;
+			blog(LOG_INFO, "update: %s, current: %s, skip: %s", version.c_str(), PLUGIN_VERSION, skip.c_str());
+			auto skipVersion = QVersionNumber::fromString(skip);
+			if ((forceCheck || skipVersion != updateVersion) && updateVersion > currentVersion) {
+				// Reset the "skip this update" flag because we now have a
+				// new update.
+				_skipUpdate = !forceCheck ? "" : _skipUpdate;  
+				blog(LOG_INFO, "UPDATE FOUND.");
+				openUpdateModal(version, downloadUrl);
+			}
+		} else {
+			throw("Error");
+		}
+	}
+	catch (...) {
+		blog(LOG_INFO, "Unable to contact update server.");
+	}
+}
+
+void ElgatoCloud::SetSkipVersion(std::string version)
+{
+	_skipUpdate = version;
+	_SaveState();
+}
+
 void ElgatoCloud::LoadPurchasedProducts()
 {
 	if (!loggedIn) {
@@ -441,6 +481,7 @@ void ElgatoCloud::_SaveState()
 			 _accessTokenExpiration);
 	obs_data_set_int(_config, "RefreshTokenExpiration",
 			 _refreshTokenExpiration);
+	obs_data_set_string(_config, "SkipUpdate", _skipUpdate.c_str());
 	SaveConfig();
 }
 
@@ -452,6 +493,7 @@ void ElgatoCloud::_GetSavedState()
 		obs_data_get_int(_config, "AccessTokenExpiration");
 	_refreshTokenExpiration =
 		obs_data_get_int(_config, "RefreshTokenExpiration");
+	_skipUpdate = obs_data_get_string(_config, "SkipUpdate");
 }
 
 } // namespace elgatocloud

src/elgato-cloud-data.hpp

@@ -52,7 +52,9 @@ class ElgatoCloud {
 	void StartLogin();
 	void LogOut();
 	void LoadPurchasedProducts();
+	void CheckUpdates(bool forceCheck);
 	obs_data_t *GetConfig();
+	void SetSkipVersion(std::string version);
 	void SaveConfig();
 	nlohmann::json GetPurchaseDownloadLink(std::string variantId);
 
@@ -87,6 +89,7 @@ class ElgatoCloud {
 	std::string _refreshToken;
 	int64_t _accessTokenExpiration;
 	int64_t _refreshTokenExpiration;
+	std::string _skipUpdate;
 	obs_data_t *_config;
 	bool _makerToolsOnStart;
 };

src/elgato-cloud-window.cpp

@@ -226,7 +226,7 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	imageBaseDir += "/images/";
 
 	auto api = MarketplaceApi::getInstance();
-	std::string storeUrl = api->storeUrl() + "/graphics/scene-collections";
+	std::string storeUrl = api->storeUrl() + "/obs/scene-collections?utm_source=mp_connect";
 
 	QPalette pal = QPalette();
 	pal.setColor(QPalette::Window, "#151515");
@@ -306,6 +306,11 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 
 WindowToolBar::~WindowToolBar() {}
 
+void WindowToolBar::disableLogout(bool disabled)
+{
+	_logOutButton->setDisabled(disabled);
+}
+
 void WindowToolBar::updateState()
 {
 	_logInButton->setHidden(elgatoCloud->loggedIn);
@@ -523,6 +528,7 @@ void ElgatoCloudWindow::initialize()
 
 void ElgatoCloudWindow::setLoading()
 {
+	_toolbar->disableLogout(true);
 	_stackedContent->setCurrentIndex(3);
 }
 
@@ -538,13 +544,15 @@ void ElgatoCloudWindow::on_logOutButton_clicked()
 
 void ElgatoCloudWindow::setLoggedIn()
 {
+	_toolbar->disableLogout(false);
 	if (elgatoCloud->connectionError) {
 		_stackedContent->setCurrentIndex(2);
 	} else if (elgatoCloud->loginError) {
 		_stackedContent->setCurrentIndex(4);
 	} else if (!elgatoCloud->loggedIn) {
 		_stackedContent->setCurrentIndex(1);
 	} else if (elgatoCloud->loading) {
+		_toolbar->disableLogout(true);
 		_stackedContent->setCurrentIndex(3);
 	} else {
 		_stackedContent->setCurrentIndex(0);
@@ -844,8 +852,9 @@ extern void InitElgatoCloud(obs_module_t *module)
 {
 	elgatoCloud = new ElgatoCloud(module);
 	QAction *action = (QAction *)obs_frontend_add_tools_menu_qaction(
-		"Elgato Marketplace");
+		"Elgato Marketplace Connect");
 	action->connect(action, &QAction::triggered, OpenElgatoCloudWindow);
+	obs_frontend_add_event_callback(CheckForUpdatesOnLaunch, nullptr);
 }
 
 extern void ShutDown()
@@ -861,4 +870,20 @@ extern obs_data_t *GetElgatoCloudConfig()
 	return nullptr;
 }
 
+extern void CheckForUpdates(bool forceCheck)
+{
+	if (!elgatoCloud) {
+		return;
+	}
+	elgatoCloud->CheckUpdates(forceCheck);
+}
+
+extern void CheckForUpdatesOnLaunch(enum obs_frontend_event event, void* private_data)
+{
+	if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING) {
+		obs_frontend_remove_event_callback(CheckForUpdatesOnLaunch, nullptr);
+		CheckForUpdates(false);
+	}
+}
+
 } // namespace elgatocloud

src/elgato-cloud-window.hpp

@@ -116,6 +116,7 @@ class WindowToolBar : public QWidget {
 	WindowToolBar(QWidget *parent);
 	~WindowToolBar();
 	void updateState();
+	void disableLogout(bool disabled);
 
 private:
 	QHBoxLayout *_layout;
@@ -234,5 +235,7 @@ void OpenElgatoCloudWindow();
 void CloseElgatoCloudWindow();
 ElgatoCloudWindow *GetElgatoCloudWindow();
 void ElgatoCloudWindowSetEnabled(bool enable);
+void CheckForUpdates(bool forceCheck);
+void CheckForUpdatesOnLaunch(enum obs_frontend_event event, void* private_data);
 
 } // namespace elgatocloud