TODO

@@ -0,0 +1,4 @@
+ - Investigate memory leaks (relevant now that we have a single user mode,
+ so qsrun may stay open after launch)
+ - Provide --help
+ - ESC/CTRL+Q close the app. May not be expected behaviour

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;
@@ -25,22 +20,20 @@ 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.
 	// https://standards.freedesktop.org/desktop-entry-spec/latest/ar01s03.html#group-header
-	// Ignore that as there some that violate that in the wild
-	const QString startSection = "[Desktop Entry]";
-	QString line;
+	QString firstLine;
 	do
 	{
-		line = stream.readLine().trimmed();
-	} while(!stream.atEnd() && line != startSection);
+		firstLine = stream.readLine().trimmed();
+	} while(!stream.atEnd() && (firstLine.isEmpty() || firstLine[0] == '#'));
 
-	if(line != startSection)
+	if(firstLine != "[Desktop Entry]")
 	{
-		throw ConfigFormatException(".desktop file does not contain [Desktop Entry] section: " + path.toStdString());
+		throw ConfigFormatException(".desktop file does not start with [Desktop Entry]: " + path.toStdString());
 	}
 
 	while(!stream.atEnd())
@@ -86,10 +79,6 @@ EntryConfig EntryProvider::readFromDesktopFile(const QString &path)
 		{
 			result.hidden = args == "true";
 		}
-		if(key == "terminal")
-		{
-			result.isTerminalCommand = args == "true";
-		}
 	}
 	result.type = EntryType::SYSTEM;
 	return result;
@@ -122,7 +111,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);
@@ -133,7 +122,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);
@@ -141,7 +130,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;
 	}
@@ -156,7 +145,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"];
@@ -164,7 +153,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")
@@ -177,7 +166,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
@@ -230,7 +219,6 @@ EntryConfig EntryProvider::readqsrunFile(const QString &path)
 	}
 	result.col = map["col"].toInt();
 	result.row = map["row"].toInt();
-	result.isTerminalCommand = map["terminal"] == "true";
 	return result;
 }
 
@@ -292,7 +280,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");
 	}
@@ -303,35 +291,32 @@ void EntryProvider::saveUserEntry(const EntryConfig &config)
 		throw std::runtime_error("Error: Can not open file for writing");
 	}
 	QTextStream outStream(&file);
-	outStream << "type" << " " << ((config.type == EntryType::USER) ? "user" : "inherit") << Qt::endl;
+	outStream << "type" << " " << ((config.type == EntryType::USER) ? "user" : "inherit") << endl;
 	if(!config.inherit.isEmpty())
 	{
-		outStream << "inherit" << " " << config.inherit << Qt::endl;
-	}
-	outStream << "row" << " " << config.row << Qt::endl;
-	outStream << "col" << " " << config.col << Qt::endl;
-	outStream << "hidden" << " " << config.hidden << Qt::endl;
-	if(!config.key.isEmpty())
-	{
-		outStream << "key" << " " << config.key << Qt::endl;
+		outStream << "inherit" << " " << config.inherit << endl;
 	}
+	outStream << "row" << " " << config.row << endl;
+	outStream << "col" << " " << config.col << endl;
+	outStream << "hidden" << " " << config.hidden << endl;
+	outStream << "key" << " " << config.key << endl;
 	if(config.type == EntryType::USER)
 	{
 		if(!config.name.isEmpty())
 		{
-			outStream << "name" << " " << config.name << Qt::endl;
+			outStream << "name" << " " << config.name << endl;
 		}
 		if(!config.command.isEmpty())
 		{
-			outStream << "command" << " " << config.command << Qt::endl;
+			outStream << "command" << " " << config.command << endl;
 		}
 		if(!config.iconPath.isEmpty())
 		{
-			outStream << "icon" << " " << config.iconPath << Qt::endl;
+			outStream << "icon" << " " << config.iconPath << endl;
 		}
 		if(!config.arguments.empty())
 		{
-			outStream << "arguments" << " " << config.arguments.join(' ') << Qt::endl;
+			outStream << "arguments" << " " << config.arguments.join(' ') << endl;
 		}
 	}
 
@@ -349,7 +334,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

@@ -19,8 +19,7 @@ enum EntryType
 {
 	USER,
 	INHERIT,
-	SYSTEM,
-	DYNAMIC
+	SYSTEM
 };
 
 class EntryConfig
@@ -28,7 +27,6 @@ class EntryConfig
   public:
 	EntryType type = SYSTEM;
 	bool hidden = false;
-	bool isTerminalCommand = false;
 	QString entryPath;
 	QString key;
 	QString name;
@@ -56,7 +54,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);

entrypushbutton.cpp

@@ -23,17 +23,21 @@ EntryPushButton::EntryPushButton(const EntryConfig &config) : QPushButton()
 {
 	this->setText(config.name);
 	this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-	QIcon icon;
-	if(config.isTerminalCommand && config.iconPath.isEmpty())
-	{
-		icon = resolveIcon("utilities-terminal");
-	}
-	else
-	{
-		icon = resolveIcon(config.iconPath);
-	}
+	QIcon icon = resolveIcon(config.iconPath);
 	this->setIcon(icon);
-	this->setIconSize(QSize{256, 256});
+	if(!icon.availableSizes().isEmpty())
+	{
+		auto sizes = icon.availableSizes();
+		QSize maxSize = sizes.first();
+		for(QSize &current : sizes)
+		{
+			if(current.width() > maxSize.width())
+			{
+				maxSize = current;
+			}
+		}
+		this->setIconSize(maxSize);
+	}
 	this->config = config;
 	connect(this, SIGNAL(clicked()), this, SLOT(emitOwnClicked()));
 
@@ -94,7 +98,7 @@ void EntryPushButton::mousePressEvent(QMouseEvent *event)
 		{
 			this->userEntryMenu.exec(QCursor::pos());
 		}
-		else if(this->config.type == EntryType::SYSTEM)
+		else
 		{
 			this->systemEntryMenu.exec(QCursor::pos());
 		}
@@ -104,7 +108,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

@@ -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

@@ -28,13 +28,3 @@ bool SettingsProvider::singleInstanceMode() const
 {
 	return settings->value("singleInstance", true).toBool();
 }
-
-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

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

window.cpp

@@ -120,17 +120,7 @@ void Window::populateGrid(const QVector<EntryPushButton *> &list)
 
 void Window::executeConfig(const EntryConfig &config)
 {
-	if(config.isTerminalCommand || QApplication::keyboardModifiers().testFlag(Qt::ShiftModifier))
-	{
-		QString cmd = settingsProvider->getTerminalCommand();
-		cmd.replace("%c", config.command);
-		QStringList args = QProcess::splitCommand(cmd);
-		QProcess::startDetached(args[0], args);
-	}
-	else
-	{
-		QProcess::startDetached(config.command, config.arguments);
-	}
+	QProcess::startDetached(config.command, config.arguments);
 	this->closeWindow();
 }
 
@@ -167,7 +157,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));
 }
 
@@ -267,7 +256,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);
@@ -345,7 +333,6 @@ void Window::lineEditTextChanged(QString text)
 			}
 			e.command = arguments[0];
 			e.iconPath = "utilities-terminal";
-			e.type = EntryType::DYNAMIC;
 
 			EntryPushButton *button = createEntryButton(e);
 			clearGrid();
@@ -385,10 +372,7 @@ void Window::keyPressEvent(QKeyEvent *event)
 
 		for(EntryPushButton *button : buttonsInGrid)
 		{
-			if(!button->getEntryConfig().key.isEmpty())
-			{
-				button->showShortcut();
-			}
+			button->showShortcut();
 		}
 
 		QKeySequence seq(event->key());
@@ -404,27 +388,6 @@ void Window::keyPressEvent(QKeyEvent *event)
 	QWidget::keyPressEvent(event);
 }
 
-int Window::rankConfig(const EntryConfig &config, QString filter) const
-{
-	if(config.name.startsWith(filter, Qt::CaseInsensitive))
-	{
-		return 0;
-	}
-	else if(config.command.startsWith(filter, Qt::CaseInsensitive))
-	{
-		return 1;
-	}
-	else if(config.name.contains(filter, Qt::CaseInsensitive))
-	{
-		return 2;
-	}
-	else if(config.command.contains(filter, Qt::CaseInsensitive))
-	{
-		return 3;
-	}
-	return -1;
-}
-
 void Window::filterGridFor(QString filter)
 {
 	if(filter.length() > 0)
@@ -433,8 +396,7 @@ void Window::filterGridFor(QString filter)
 		bool userEntryMatch = false;
 		for(EntryPushButton *button : this->userEntryButtons)
 		{
-			if(button->getName().contains(filter, Qt::CaseInsensitive) ||
-			   button->getCommand().contains(filter, Qt::CaseInsensitive))
+			if(button->getName().contains(filter, Qt::CaseInsensitive))
 			{
 				button->setVisible(true);
 				grid->addWidget(button, button->getRow(), button->getCol());
@@ -444,38 +406,26 @@ void Window::filterGridFor(QString filter)
 		}
 		if(!userEntryMatch)
 		{
-			QVector<RankedButton> rankedEntries;
 			int currow = 0;
 			int curcol = 0;
 			int i = 1;
 			const int MAX_COLS = this->settingsProvider->getMaxCols();
 			for(EntryPushButton *button : this->systemEntryButtons)
 			{
-				int ranking = rankConfig(button->getEntryConfig(), filter);
-				if(ranking > -1)
+				if(button->getName().contains(filter, Qt::CaseInsensitive))
 				{
-					RankedButton rb;
-					rb.button = button;
-					rb.ranking = ranking;
-					rankedEntries.append(rb);
-				}
-			}
-			std::sort(rankedEntries.begin(), rankedEntries.end(),
-					  [](const RankedButton &a, const RankedButton &b) -> bool { return a.ranking < b.ranking; });
-			for(RankedButton &rankedButton : rankedEntries)
-			{
-				EntryPushButton *button = rankedButton.button;
-				button->setVisible(true);
-				if(i < 10)
-				{
-					button->setShortcutKey(QString::number(i++));
-				}
-				grid->addWidget(button, currow, curcol++);
-				this->buttonsInGrid.append(button);
-				if(curcol == MAX_COLS)
-				{
-					curcol = 0;
-					++currow;
+					button->setVisible(true);
+					if(i < 10)
+					{
+						button->setShortcutKey(QString::number(i++));
+					}
+					grid->addWidget(button, currow, curcol++);
+					this->buttonsInGrid.append(button);
+					if(curcol == MAX_COLS)
+					{
+						curcol = 0;
+						++currow;
+					}
 				}
 			}
 		}

window.h

@@ -37,13 +37,6 @@
 #include "calculationengine.h"
 #include "settingsprovider.h"
 
-class RankedButton
-{
-  public:
-	EntryPushButton *button = nullptr;
-	int ranking;
-};
-
 class Window : public QWidget
 {
 	Q_OBJECT
@@ -84,7 +77,7 @@ class Window : public QWidget
 	QStringList generatePATHSuggestions(const QString &text);
 	void closeWindow();
 	std::pair<int, int> getNextFreeCell();
-	int rankConfig(const EntryConfig &config, QString filter) const;
+
   private slots:
 	void lineEditReturnPressed();
 	void showCalculationResultContextMenu(const QPoint &point);