progress

Desktop/gui/preferencesmodel.cpp.in

@@ -127,6 +127,7 @@ GET_PREF_FUNC_BOOL( reportingMode,				Settings::REPORT_SHOW								)
 GET_PREF_FUNC_BOOL( showRSyntax,				Settings::SHOW_RSYNTAX								)
 GET_PREF_FUNC_BOOL( showAllROptions,			Settings::SHOW_ALL_R_OPTIONS						)
 GET_PREF_FUNC_BOOL( showRSyntaxInResults,		Settings::SHOW_RSYNTAX_IN_RESULTS					)
+GET_PREF_FUNC_STR(	remoteSettingsURL,			Settings::REMOTE_SETTINGS_URL						)
 
 int PreferencesModel::maxEngines() const
 {
@@ -307,6 +308,8 @@ SET_PREF_FUNCTION(				bool,		setReportingMode,			reportingMode,				reportingMode
 SET_PREF_FUNCTION_EMIT_NO_ARG(	bool,		setShowRSyntax,				showRSyntax,				showRSyntaxChanged,				Settings::SHOW_RSYNTAX								)
 SET_PREF_FUNCTION_EMIT_NO_ARG(	bool,		setShowAllROptions,			showAllROptions,			showAllROptionsChanged,			Settings::SHOW_ALL_R_OPTIONS						)
 SET_PREF_FUNCTION(				bool,		setShowRSyntaxInResults,	showRSyntaxInResults,		showRSyntaxInResultsChanged,	Settings::SHOW_RSYNTAX_IN_RESULTS					)
+SET_PREF_FUNCTION(				QString,	setRemoteSettingsURL,		remoteSettingsURL,			remoteSettingsURLChanged,		Settings::REMOTE_SETTINGS_URL						)
+
 
 void PreferencesModel::setGithubPatCustom(QString newPat)
 {

Desktop/gui/remotesettings.cpp

@@ -7,54 +7,113 @@
 #include <QTextStream>
 #include <QRegularExpression>
 #include <QString>
+#include <QDir>
 
 
 RemoteSettings::RemoteSettings(QObject *parent)
 	: QObject{parent}
 {
 	//connect(&_networkManager, &QNetworkAccessManager::finished, this, &RemoteSettings::downloadFinished);
-	versionRE.setPattern("Version:\\s*(?<versionNum>\\d+)");
+//	versionRE.setPattern("Version:\\s*(?<versionNum>\\d+)");
 }
 
 void RemoteSettings::processRemoteSettings()
 {
 	//read & parse local
 	QString confPath = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
-	QFile local(confPath + configurationFilename);
-	if (!local.open(QIODevice::ReadWrite | QIODevice::Text))
+	QDir confDir;
+	confDir.mkpath(confPath);
+
+	QString settingsPath = confPath + "/" + configurationFilename;
+	QFile localSettingsFile(settingsPath);
+	if (!localSettingsFile.open(QIODevice::ReadWrite | QIODevice::Text))
 	{
-		Log::log() << "Could not open local configuration file!";
+		Log::log() << "!!!Could not open local configuration file " << settingsPath.toStdString() << ": " << localSettingsFile.errorString().toStdString() << std::endl;
 		return;
 	}
-	QTextStream in(&local);
+	QTextStream in(&localSettingsFile);
 	parse(in.readAll());
+	localSettingsFile.close();
+
+
+	//read,parse & save remote settings
+	auto conn = std::make_shared<QMetaObject::Connection>();
+	*conn = connect(&_networkManager, &QNetworkAccessManager::finished, this, [&, this, settingsPath, conn](QNetworkReply* reply) {
+		QObject::disconnect(*conn);
+		reply->deleteLater();
+
+		if(reply->error())
+		{
+			Log::log() << "!!!Error fetching remote settings file " << reply->request().url().toString().toStdString() << " : " << reply->errorString().toStdString() << std::endl;
+			emit this->remoteSettingsProcessed("FAIL");
+			return;
+		}
+		QString payload = reply->readAll();
+		parse(payload);
 
+		QFile localSettingsFile(settingsPath);
+		if (!localSettingsFile.open(QIODevice::ReadWrite | QIODevice::Text))
+		{
+			Log::log() << "!!!Could not open local configuration file " << settingsPath.toStdString() << ": " << localSettingsFile.errorString().toStdString() << std::endl;
+			emit this->remoteSettingsProcessed("FAIL");
+			return;
+		}
+		localSettingsFile.write(payload.toUtf8());
+		localSettingsFile.close();
 
-	//read & parse remote
+		Log::log() << "!!!Updated local copy of remote settings" << std::endl;
+		emit this->remoteSettingsProcessed("OK");
+	});
+
+	//make the request
+	QNetworkRequest request(Settings::value(Settings::REMOTE_SETTINGS_URL).toString());
+	QNetworkReply* reply = _networkManager.get(request);
+	connect(reply, &QNetworkReply::sslErrors, this, &RemoteSettings::sslErrors);
 }
 
-void RemoteSettings::parse(const QString &settings)
+void RemoteSettings::remoteChanged(QString remoteURL)
 {
-	_version = getVersion(settings);
+	processRemoteSettings();
+}
 
+void RemoteSettings::parse(const QString &settings)
+{
 	_patches.clear();
 	QStringList lines = settings.split("\n");
 	for(auto& line : lines)
 	{
-		auto match =  versionRE.match(line);
-		if(!match.hasMatch())
-			_patches.append(line);
+		_patches.insert(line);
 	}
 }
 
-int32_t RemoteSettings::getVersion(const QString& settings)
+void RemoteSettings::sslErrors(const QList<QSslError> &errors)
 {
-	auto match =  versionRE.match(settings);
-	if(match.hasCaptured("versionNum"))
-	{
-		bool ok;
-		int32_t version = match.captured("versionNum").toULong(&ok);
-		return ok ? version : -1;
-	}
-	return -1;
+	for (const QSslError &error : errors)
+		Log::log() << "!!!Error fetching remote settings:" << error.errorString().toStdString() << std::endl;
 }
+
+//void RemoteSettings::parse(const QString &settings)
+//{
+//	_version = getVersion(settings);
+
+//	_patches.clear();
+//	QStringList lines = settings.split("\n");
+//	for(auto& line : lines)
+//	{
+//		auto match =  versionRE.match(line);
+//		if(!match.hasMatch())
+//			_patches.append(line);
+//	}
+//}
+
+//int32_t RemoteSettings::getVersion(const QString& settings)
+//{
+//	auto match =  versionRE.match(settings);
+//	if(match.hasCaptured("versionNum"))
+//	{
+//		bool ok;
+//		int32_t version = match.captured("versionNum").toULong(&ok);
+//		return ok ? version : -1;
+//	}
+//	return -1;
+//}

Desktop/gui/remotesettings.h

@@ -26,17 +26,14 @@ private slots:
 private:
 	void processTasks();
 	void parse(const QString& settings);
-	int32_t getVersion(const QString& settings);
-	QNetworkReply* download(const QString& path);
-	bool saveToDisk(const QString& path, QNetworkReply* data);
-
+//	int32_t getVersion(const QString& settings);
 
 	QNetworkAccessManager	_networkManager;
-	int32_t _version = -1;
-	QList<QString> _patches;
+//	int32_t _version = -1;
+	QSet<QString> _patches;
 
-	const QString configurationFilename = "jasp.conf";
-	static QRegularExpression versionRE;
+	const QString configurationFilename = "remote_settings.conf";
+//	static QRegularExpression versionRE;
 
 };
 

Desktop/mainwindow.cpp

@@ -148,6 +148,7 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 	_resultMenuModel		= new ResultMenuModel(this);
 	_plotEditorModel		= new PlotEditorModel();
 	_columnTypesModel		= new ColumnTypesModel(this);
+	_remoteSettings			= new RemoteSettings(this);
 
 #ifdef WIN32
 	_windowsWorkaroundCPs	= new CodePagesWindows(this);
@@ -159,6 +160,8 @@ MainWindow::MainWindow(QApplication * application) : QObject(application), _appl
 
 	makeConnections();
 
+	_remoteSettings->processRemoteSettings();
+
 	qmlRegisterUncreatableType<JASPControl>						("JASP",		1, 0 ,"JASP",				"Impossible to create JASP Object"	); //This is here to keep JASP.enum short I guess?
 	qmlRegisterUncreatableType<MessageForwarder>				("JASP",		1, 0, "MessageForwarder",	"You can't touch this"				);
 
@@ -372,6 +375,7 @@ void MainWindow::makeConnections()
 	connect(_preferences,			&PreferencesModel::missingValuesChanged,			_package,				&DataSetPackage::emptyValuesChangedHandler					);
 	connect(_preferences,			&PreferencesModel::dataLabelNAChanged,				_package,				&DataSetPackage::refresh,									Qt::QueuedConnection);
 	connect(_preferences,			&PreferencesModel::dataAutoSynchronizationChanged,	_package,				&DataSetPackage::synchingExternallyChanged					);
+	connect(_preferences,			&PreferencesModel::remoteSettingsURLChanged,		_remoteSettings,		&RemoteSettings::remoteChanged								);
 	connect(_preferences,			&PreferencesModel::plotBackgroundChanged,			this,					&MainWindow::setImageBackgroundHandler						);
 	connect(_preferences,			&PreferencesModel::plotPPIChanged,					this,					&MainWindow::plotPPIChangedHandler							);
 	connect(_preferences,			&PreferencesModel::dataAutoSynchronizationChanged,	_fileMenu,				&FileMenu::dataAutoSynchronizationChanged					);

Desktop/mainwindow.h

@@ -40,6 +40,7 @@
 #include "gui/aboutmodel.h"
 #include "gui/columntypesmodel.h"
 #include "gui/preferencesmodel.h"
+#include "gui/remotesettings.h"
 #include "modules/dynamicmodule.h"
 #include "modules/ribbonbutton.h"
 #include "modules/ribbonmodelfiltered.h"
@@ -281,6 +282,7 @@ private slots:
 	Upgrader					*	_upgrader				= nullptr;
 	Reporter					*	_reporter				= nullptr;
 	CodePagesWindows			*	_windowsWorkaroundCPs	= nullptr;
+	RemoteSettings				*	_remoteSettings			= nullptr;
 
 	QSettings						_settings;