fixup! Implement basic 'Terminal=' support for .desktop files

entryprovider.cpp

@@ -13,11 +13,6 @@ 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;
@@ -290,7 +285,7 @@ QVector<EntryConfig> EntryProvider::getSystemEntries()
 
 void EntryProvider::saveUserEntry(const EntryConfig &config)
 {
-	if(!isSavable(config))
+	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
 	{
 		throw std::runtime_error("Only user/inherited entries can be saved");
 	}
@@ -344,7 +339,7 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 
 bool EntryProvider::deleteUserEntry(const EntryConfig &config)
 {
-	if(!isSavable(config))
+	if(config.type == EntryType::SYSTEM || config.entryPath.isEmpty())
 	{
 		throw std::runtime_error("Only user/inherited entries can be deleted");
 	}

entryprovider.h

@@ -55,7 +55,6 @@ 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,7 +14,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <QApplication>
-#include <QCommandLineParser>
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QtConcurrent/QtConcurrentRun>
@@ -31,76 +30,56 @@ 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"},
-			{"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))
+		configDirectoryPath = QCoreApplication::arguments().at(1);
+		if(!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>");
 
-	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;
 		}
 	}
 
 	QSettings settings(configDirectoryPath + "qsrun.config", QSettings::NativeFormat);
 
-	SettingsProvider settingsProvider{settings};
+	SettingsProvider settingsProvider { settings };
 	EntryProvider entryProvider(settingsProvider.userEntriesPaths(), settingsProvider.systemApplicationsEntriesPaths());
-
-	SingleInstanceServer *server = nullptr;
-
-	bool singleInstanceMode = !newInstanceRequested && settingsProvider.singleInstanceMode();
-	if(singleInstanceMode)
+	//TODO if setting single instance mode
+	QLocalSocket localSocket;
+	localSocket.connectToServer("/tmp/qsrun.socket");
+	SingleInstanceServer server;
+	if(localSocket.isOpen() && localSocket.isWritable())
 	{
-		QLocalSocket localSocket;
-		localSocket.connectToServer(settingsProvider.socketPath());
-		if(localSocket.isOpen() && localSocket.isWritable())
-		{
-			QDataStream stream(&localSocket);
-			stream << (int)0x01; // maximize
-			localSocket.flush();
-			localSocket.waitForBytesWritten();
-			localSocket.disconnectFromServer();
-			return 0;
-		}
-
-		server = new SingleInstanceServer();
-		if(!server->listen(settingsProvider.socketPath()))
+		QDataStream stream(&localSocket);
+		stream << (int)0x01; //maximize
+		localSocket.flush();
+		localSocket.waitForBytesWritten();
+		localSocket.disconnectFromServer();
+		return 0;
+	}
+	else
+	{
+		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] {
+		Window *w = new Window { entryProvider, settingsProvider };
+		QObject::connect(&server, &SingleInstanceServer::receivedMaximizationRequest, [&w]{
 			if(w != nullptr)
 			{
 				qInfo() << "maximizing as requested by other instance";
@@ -110,10 +89,12 @@ int main(int argc, char *argv[])
 				w->focusInput();
 			}
 		});
+		w->showMaximized();
+		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

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