Support arguments for the external download program

dgraziotin · Feb 1, 2010 · 0405e86 · 0405e86
1 parent 58950bf
commit 0405e86
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
@@ -527,7 +527,15 @@ bool DownloadManager::externalDownload(const QUrl &url)
     if (program.isEmpty())
         return false;
 
-    return QProcess::startDetached(program, QStringList() << QString::fromUtf8(url.toEncoded()));
+    // Split program at every space not inside double quotes
+    QRegExp regex(QLatin1String("\"([^\"]+)\"|([^ ]+)"));
+    QStringList args;
+    for (int pos = 0; (pos = regex.indexIn(program, pos)) != -1; pos += regex.matchedLength())
+        args << regex.cap(1) + regex.cap(2);
+    if (args.isEmpty())
+        return false;
+
+    return QProcess::startDetached(args.takeFirst(), args << QString::fromUtf8(url.toEncoded()));
 }
 
 void DownloadManager::download(const QNetworkRequest &request, bool requestFileName)

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -484,6 +484,8 @@ void SettingsDialog::chooseDownloadDirectory()
 void SettingsDialog::chooseDownloadProgram()
 {
     QString fileName = QFileDialog::getOpenFileName(this, tr("Choose Program"), externalDownloadPath->text());
+    if (fileName.contains(QLatin1Char(' ')))
+        fileName = QString(QLatin1String("\"%1\"")).arg(fileName);
     externalDownloadPath->setText(fileName);
 }