main: don't ignore config value for single instance mode. allow override using cli param

Fixes: #17

entryprovider.cpp

@@ -13,6 +13,11 @@ EntryProvider::EntryProvider(QStringList userEntriesDirsPaths, QStringList syste
 					   << "%u";
 }
 
+bool EntryProvider::isSavable(const EntryConfig &config) const
+{
+	return ! config.entryPath.isEmpty() && (config.type == EntryType::USER || config.type == EntryType::INHERIT);
+}
+
 EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 {
 	EntryConfig result;
@@ -285,7 +290,7 @@ QVector<EntryConfig> EntryProvider::getSystemEntries()
 
 void EntryProvider::saveUserEntry(const EntryConfig &config)
 {
-	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
+	if(!isSavable(config))
 	{
 		throw std::runtime_error("Only user/inherited entries can be saved");
 	}
@@ -339,7 +344,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 
 bool EntryProvider::deleteUserEntry(const EntryConfig &config)
 {
-	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
+	if(!isSavable(config))
 	{
 		throw std::runtime_error("Only user/inherited entries can be deleted");
 	}

entryprovider.h

@@ -55,6 +55,7 @@ class EntryProvider
 
   public:
 	EntryProvider(QStringList userEntriesDirsPaths, QStringList systemEntriesDirsPaths);
+	bool isSavable(const EntryConfig &config) const;
 	QVector<EntryConfig> getUserEntries();
 	QVector<EntryConfig> getSystemEntries();
 	void saveUserEntry(const EntryConfig &config);

main.cpp

@@ -14,6 +14,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <QApplication>
+#include <QCommandLineParser>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrentRun>
@@ -30,27 +31,38 @@ int main(int argc, char *argv[])
 	QApplication app(argc, argv);
 	QString configDirectoryPath;
 	QDir dir;
+	bool newInstanceRequested = false;
 	if(argc >= 2)
 	{
-		configDirectoryPath = QCoreApplication::arguments().at(1);
+		QCommandLineParser parser;
-		if(!dir.exists(configDirectoryPath))
+		parser.addOptions({
+			{"new-instance", "Launch a new instance, ignoring any running ones"},
+			{"config", "Use supplied config dir instead of default"},
+		});
+		parser.addHelpOption();
+		parser.process(app.arguments());
+		configDirectoryPath = parser.value("config");
+		newInstanceRequested = parser.isSet("new-instance");
+
+		if(!configDirectoryPath.isEmpty() && !dir.exists(configDirectoryPath))
 		{
 			QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
 			return 1;
 		}
 	}
-	else
+	if(configDirectoryPath.isEmpty())
 	{
 		configDirectoryPath = QDir::homePath() + "/.config/qsrun/";
 	}
-	qRegisterMetaType<QVector<QString> >("QVector<QString>");
 
+	qRegisterMetaType<QVector<QString>>("QVector<QString>");
 
 	if(!dir.exists(configDirectoryPath))
 	{
 		if(!dir.mkdir(configDirectoryPath))
 		{
-			QMessageBox::warning(nullptr, "Failed to create dir", configDirectoryPath + " was not found and could not be created!");
+			QMessageBox::warning(nullptr, "Failed to create dir",
+								 configDirectoryPath + " was not found and could not be created!");
 			return 1;
 		}
 	}
@@ -59,10 +71,14 @@ int main(int argc, char *argv[])
 
 	SettingsProvider settingsProvider{settings};
 	EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
-	//TODO if setting single instance mode
+
+	SingleInstanceServer *server = nullptr;
+
+	bool singleInstanceMode = !newInstanceRequested && settingsProvider.singleInstanceMode();
+	if(singleInstanceMode)
+	{
 		QLocalSocket localSocket;
-	localSocket.connectToServer("/tmp/qsrun.socket");
+		localSocket.connectToServer(settingsProvider.socketPath());
-	SingleInstanceServer server;
 		if(localSocket.isOpen() && localSocket.isWritable())
 		{
 			QDataStream stream(&localSocket);
@@ -72,14 +88,19 @@ int main(int argc, char *argv[])
 			localSocket.disconnectFromServer();
 			return 0;
 		}
-	else
+
-	{
+		server = new SingleInstanceServer();
-		if(!server.listen("/tmp/qsrun.socket"))
+		if(!server->listen(settingsProvider.socketPath()))
 		{
 			qDebug() << "Failed to listen on socket!";
+			return 1;
 		}
+	}
+
 	Window *w = new Window{entryProvider, settingsProvider};
-		QObject::connect(&server, &SingleInstanceServer::receivedMaximizationRequest, [&w]{
+	if(singleInstanceMode && server != nullptr)
+	{
+		QObject::connect(server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
 			if(w != nullptr)
 			{
 				qInfo() << "maximizing as requested by other instance";
@@ -89,12 +110,10 @@ int main(int argc, char *argv[])
 				w->focusInput();
 			}
 		});
+	}
+
 	w->showMaximized();
 	w->focusInput();
 
-	}
-
-
-
 	return app.exec();
 }

settingsprovider.cpp

@@ -33,3 +33,8 @@ QString SettingsProvider::getTerminalCommand() const
 {
 	return settings->value("terminal", "/usr/bin/x-terminal-emulator -e %c").toString();
 }
+
+QString SettingsProvider::socketPath() const
+{
+	return settings->value("singleInstanceSocket", "/tmp/qsrun").toString();
+}

settingsprovider.h

@@ -16,6 +16,7 @@ class SettingsProvider
 	virtual int getMaxCols() const;
 	virtual bool singleInstanceMode() const;
 	QString getTerminalCommand() const;
+	QString socketPath() const;
 };
 
 #endif // SETTINGSPROVIDER_H

window.cpp

@@ -123,7 +123,7 @@ void Window::executeConfig(const EntryConfig &config)
 	if(config.isTerminalCommand)
 	{
 		QString cmd = settingsProvider->getTerminalCommand();
-		cmd.replace("%c", config.command + " " + config.arguments.join(' '));
+		cmd.replace("%c", config.command);
 		QProcess::startDetached(cmd);
 	}
 	else