crtxcr/qsrun
1
0
Fork 0
Code Issues 29 Pull Requests 1 Releases Activity

Support for " in qsrun config files to merge args

Browse Source
This commit is contained in:
Albert S. 2019-06-09 13:06:14 +02:00
parent 117facea1c
commit ee936541c6
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
config.cpp
View File

@ -46,7 +46,7 @@ EntryConfig ConfigReader::readFromDesktopFile(const QString &path)
} }
if(firstline != "[Desktop Entry]") if(firstline != "[Desktop Entry]")
{ {
throw new ConfigFormatException(".desktop file does not start with [Desktop Entry]"); throw ConfigFormatException(".desktop file does not start with [Desktop Entry]");
} }
while(!stream.atEnd()) while(!stream.atEnd())
@ -114,12 +114,39 @@ EntryConfig ConfigReader::readFromFile(const QString &path)
QStringList splitted = line.split(" "); QStringList splitted = line.split(" ");
if(splitted.length() < 2) if(splitted.length() < 2)
{ {
throw new ConfigFormatException("misformated line in .qsrun config file"); throw new ConfigFormatException("misformated line in .qsrun config file " + path.toStdString());
} }
QString key = splitted[0]; QString key = splitted[0];
if(key == "arguments") if(key == "arguments")
{ {
result.arguments = splitted.mid(1); auto args = splitted.mid(1);
QString merged;
for(QString &str : args)
{
if(str.startsWith('"') && !str.endsWith("'"))
{
merged += str.mid(1) + " ";
}
else if(str.endsWith('"'))
{
str.chop(1);
merged += str;
result.arguments.append(merged);
merged = "";
}
else if(merged != "")
{
merged += str + " ";
}
else
{
result.arguments.append(str);
}
}
if(merged != "")
{
throw ConfigFormatException("non-closed \" in config file " + path.toStdString());
}
} }
if(key == "name") if(key == "name")
{ {