From 40707784b97d983c170d4bf845c5ae405852ee98 Mon Sep 17 00:00:00 2001
From: legatvs <legatvs.git@gmail.com>
Date: Sun, 21 Nov 2010 23:46:13 +0200
Subject: [PATCH] additional umph specifiers

---
 src/i/Preferences.cpp | 24 ++++++++++++++++++++----
 src/i/YoutubeFeed.cpp | 18 +++++++++---------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/i/Preferences.cpp b/src/i/Preferences.cpp
index c584b50..a3829b3 100644
--- a/src/i/Preferences.cpp
+++ b/src/i/Preferences.cpp
@@ -62,10 +62,8 @@ Preferences::Preferences (QWidget *parent)
     umphPathEdit->setText (
         shPrefs.get (SharedPreferences::UmphPath).toString ());
 
-#ifdef _0
     if (umphPathEdit->text ().isEmpty ())
-        umphPathEdit->setText ("umph");
-#endif
+        umphPathEdit->setText ("umph -q --json -t %t -s %s -m %m %i");
 
     saveDirEdit->setText (
         shPrefs.get (SharedPreferences::SaveDir).toString ());
@@ -293,11 +291,17 @@ Preferences::onLanguage () {
 
 static QString
 append (QLineEdit *w, const QStringList& l = QStringList() << "%u") {
+
     QString s = w->text ();
+
+    if (s.isEmpty ())
+        return QString ();
+
     foreach (QString w, l) {
         if (!s.contains (w))
             s += " " + w;
     }
+
     return s;
 }
 
@@ -321,7 +325,19 @@ Preferences::done (int r) {
             append (playerPathEdit));
 
         shPrefs.set (SharedPreferences::UmphPath,
-            umphPathEdit->text ());
+            append (umphPathEdit,
+                QStringList ()
+                    << "-q"
+                    << "--json"
+                    << "-t"
+                    << "%t"
+                    << "-s"
+                    << "%s"
+                    << "-m"
+                    << "%m"
+                    << "%i"
+                )
+        );
 
         shPrefs.set (SharedPreferences::SaveDir,
             saveDirEdit->text ());
diff --git a/src/i/YoutubeFeed.cpp b/src/i/YoutubeFeed.cpp
index c997011..36e8708 100644
--- a/src/i/YoutubeFeed.cpp
+++ b/src/i/YoutubeFeed.cpp
@@ -155,20 +155,20 @@ YoutubeFeed::done (int r) {
         QStringList args =
             shPrefs.get (SharedPreferences::UmphPath).toString ().split (" ");
 
-        args << "--json"
-             << "--quiet"
-             << "--start-index" << startIndexSpin->text ()
-             << "--max-results" << maxResultsSpin->text ()
-             << id
-             << "--type";
+        QString type;
 
         switch (typeCombo->currentIndex ()) {
         default:
-        case  0: args << "p"; break;
-        case  1: args << "f"; break;
-        case  2: args << "u"; break;
+        case  0: type = "p"; break;
+        case  1: type = "f"; break;
+        case  2: type = "u"; break;
         }
 
+        args.replaceInStrings ("%t", type);
+        args.replaceInStrings ("%s", startIndexSpin->text ());
+        args.replaceInStrings ("%m", maxResultsSpin->text ());
+        args.replaceInStrings ("%i", id);
+
         _prog->setLabelText (tr ("Checking ..."));
         _prog->setMaximum (0);
         _prog->start (args);
-- 
2.11.4.GIT