Parse argv using QCommandLineParser

Fixes: #17

entryprovider.cpp

@@ -25,7 +25,7 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw std::runtime_error("Failed to open file");
+		throw new std::runtime_error("Failed to open file");
 	}
 	QTextStream stream(&file);
 	// There should be nothing preceding this group in the desktop entry file but possibly one or more comments.
@@ -120,7 +120,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	if(!file.open(QIODevice::ReadOnly | QIODevice::Text))
 	{
 		// TODO: better exception class
-		throw std::runtime_error("Failed to open file");
+		throw new std::runtime_error("Failed to open file");
 	}
 	QHash<QString, QString> map;
 	QTextStream stream(&file);
@@ -131,7 +131,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		int spacePos = line.indexOf(' ');
 		if(spacePos == -1)
 		{
-			throw ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
+			throw new ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
 		}
 
 		QString key = line.mid(0, spacePos);
@@ -139,7 +139,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 
 		if(key == "" || value == "")
 		{
-			throw ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
+			throw new ConfigFormatException("empty key or value in .qsrun config file " + path.toStdString());
 		}
 		map[key] = value;
 	}
@@ -154,7 +154,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw ConfigFormatException("Error attempting to read inherited entry");
+			throw new ConfigFormatException("Error attempting to read inherited entry");
 		}
 	}
 	QString type = map["type"];
@@ -162,7 +162,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	{
 		if(type == "system")
 		{
-			throw ConfigFormatException(".qsrun files cannot be designated as system entries " +
+			throw new ConfigFormatException(".qsrun files cannot be designated as system entries " +
 											path.toStdString());
 		}
 		else if(type == "inherit")
@@ -175,7 +175,7 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 		}
 		else
 		{
-			throw ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
+			throw new ConfigFormatException("Invalid value for type provided in file: " + path.toStdString());
 		}
 	}
 	else
@@ -309,10 +309,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 	outStream << "row" << " " << config.row << endl;
 	outStream << "col" << " " << config.col << endl;
 	outStream << "hidden" << " " << config.hidden << endl;
-	if(!config.key.isEmpty())
-	{
 	outStream << "key" << " " << config.key << endl;
-	}
 	if(config.type == EntryType::USER)
 	{
 		if(!config.name.isEmpty())

entryprovider.h

@@ -19,8 +19,7 @@ enum EntryType
 {
 	USER,
 	INHERIT,
-	SYSTEM,
+	SYSTEM
-	DYNAMIC
 };
 
 class EntryConfig

entrypushbutton.cpp

@@ -106,7 +106,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 		{
 			this->userEntryMenu.exec(QCursor::pos());
 		}
-		else if(this->config.type == EntryType::SYSTEM)
+		else
 		{
 			this->systemEntryMenu.exec(QCursor::pos());
 		}
@@ -116,7 +116,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 
 void EntryPushButton::mouseMoveEvent(QMouseEvent *event)
 {
-	if(this->config.type == EntryType::SYSTEM || this->config.type == EntryType::DYNAMIC)
+	if(this->config.type == EntryType::SYSTEM)
 	{
 		return;
 	}

main.cpp

@@ -31,30 +31,27 @@ int main(int argc, char *argv[])
 	QApplication app(argc, argv);
 	QString configDirectoryPath;
 	QDir dir;
-	bool newInstanceRequested = false;
 	if(argc >= 2)
 	{
 		QCommandLineParser parser;
 		parser.addOptions({
 			{"new-instance", "Launch a new instance, ignoring any running ones"},
+			{"kill-instances", "Kill all running instances"},
 			{"config", "Use supplied config dir instead of default"},
 		});
 		parser.addHelpOption();
 		parser.process(app.arguments());
 		configDirectoryPath = parser.value("config");
-		newInstanceRequested = parser.isSet("new-instance");
+		if(!dir.exists(configDirectoryPath))
-
-		if(!configDirectoryPath.isEmpty() && !dir.exists(configDirectoryPath))
 		{
 			QMessageBox::warning(nullptr, "Directory not found", configDirectoryPath + " was not found");
 			return 1;
 		}
 	}
-	if(configDirectoryPath.isEmpty())
+	else
 	{
 		configDirectoryPath = QDir::homePath() + "/.config/qsrun/";
 	}
-
 	qRegisterMetaType<QVector<QString>>("QVector<QString>");
 
 	if(!dir.exists(configDirectoryPath))
@@ -71,14 +68,10 @@ 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(settingsProvider.socketPath());
+	localSocket.connectToServer("/tmp/qsrun.socket");
+	SingleInstanceServer server;
 	if(localSocket.isOpen() && localSocket.isWritable())
 	{
 		QDataStream stream(&localSocket);
@@ -88,19 +81,14 @@ int main(int argc, char *argv[])
 		localSocket.disconnectFromServer();
 		return 0;
 	}
-
+	else
-		server = new SingleInstanceServer();
+	{
-		if(!server->listen(settingsProvider.socketPath()))
+		if(!server.listen("/tmp/qsrun.socket"))
 		{
 			qDebug() << "Failed to listen on socket!";
-			return 1;
 		}
-	}
-
 		Window *w = new Window{entryProvider, settingsProvider};
-	if(singleInstanceMode && server != nullptr)
+		QObject::connect(&server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
-	{
-		QObject::connect(server, &SingleInstanceServer::receivedMaximizationRequest, [&w] {
 			if(w != nullptr)
 			{
 				qInfo() << "maximizing as requested by other instance";
@@ -110,10 +98,9 @@ int main(int argc, char *argv[])
 				w->focusInput();
 			}
 		});
-	}
-
 		w->showMaximized();
 		w->focusInput();
+	}
 
 	return app.exec();
 }

settingsprovider.cpp

@@ -33,8 +33,3 @@ 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,7 +16,6 @@ class SettingsProvider
 	virtual int getMaxCols() const;
 	virtual bool singleInstanceMode() const;
 	QString getTerminalCommand() const;
-	QString socketPath() const;
 };
 
 #endif // SETTINGSPROVIDER_H

window.cpp

@@ -120,7 +120,7 @@ void Window::populateGrid(const QVector<EntryPushButton *> &list)
 
 void Window::executeConfig(const EntryConfig &config)
 {
-	if(config.isTerminalCommand || QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier))
+	if(config.isTerminalCommand)
 	{
 		QString cmd = settingsProvider->getTerminalCommand();
 		cmd.replace("%c", config.command);
@@ -166,7 +166,6 @@ void Window::addToFavourites(const EntryConfig &config)
 	when we add it to the favourites. the alternative would be to reload the whole config,
 	but that's probably overkill. */
 	userConfig.update(config);
-	userConfig.key = "";
 	userEntryButtons.append(createEntryButton(userConfig));
 }
 
@@ -266,7 +265,6 @@ void Window::addPATHSuggestion(const QString &text)
 		e.row = 0;
 		e.command = suggestions[0];
 		e.iconPath = suggestions[0];
-		e.type = EntryType::DYNAMIC;
 		EntryPushButton *button = createEntryButton(e);
 		clearGrid();
 		grid->addWidget(button, 0, 0);
@@ -344,7 +342,6 @@ void Window::lineEditTextChanged(QString text)
 			}
 			e.command = arguments[0];
 			e.iconPath = "utilities-terminal";
-			e.type = EntryType::DYNAMIC;
 
 			EntryPushButton *button = createEntryButton(e);
 			clearGrid();
@@ -383,12 +380,9 @@ void Window::keyPressEvent(QKeyEvent *event)
 		}
 
 		for(EntryPushButton *button : buttonsInGrid)
-		{
-			if(!button->getEntryConfig().key.isEmpty())
 		{
 			button->showShortcut();
 		}
-		}
 
 		QKeySequence seq(event->key());
 		QString key = seq.toString().toLower();