Let Vcs-* point to salsa

[minitube] / src / channelsuggest.cpp

diff --git a/src/channelsuggest.cpp b/src/channelsuggest.cpp
index c252802f3455e34ce7ba45c0f64da0c1067dd538..eff93b4de205b58c9dc88a21342993884dd8fba3 100644 (file)
--- a/src/channelsuggest.cpp
+++ b/src/channelsuggest.cpp
@@ -19,48 +19,43 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "channelsuggest.h"
-#include "networkaccess.h"
-
-namespace The {
-    NetworkAccess* http();
-}
+#include "http.h"
+#include "httputils.h"
 
 ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester(parent) {
 
 }
 
 void ChannelSuggest::suggest(const QString &query) {
-    QUrl url("http://www.youtube.com/results");
-#if QT_VERSION >= 0x050000
-        {
-            QUrl &u = url;
-            QUrlQuery url;
-#endif
-    url.addQueryItem("search_type", "search_users");
-    url.addQueryItem("search_query", query);
-#if QT_VERSION >= 0x050000
-            u.setQuery(url);
-        }
-#endif
-    QObject *reply = The::http()->get(url);
+    QUrl url("https://www.youtube.com/results");
+    QUrlQuery q;
+    q.addQueryItem("search_type", "search_users");
+    q.addQueryItem("search_query", query);
+    url.setQuery(q);
+
+    QObject *reply = HttpUtils::yt().get(url);
     connect(reply, SIGNAL(data(QByteArray)), SLOT(handleNetworkData(QByteArray)));
 }
 
 void ChannelSuggest::handleNetworkData(QByteArray data) {
+    const int maxSuggestions = 10;
     QStringList choices;
-    QList<Suggestion*> suggestions;
+    choices.reserve(maxSuggestions);
+    QVector<Suggestion*> suggestions;
+    suggestions.reserve(maxSuggestions);
 
     QString html = QString::fromUtf8(data);
-    QRegExp re("/user/([a-zA-Z0-9]+)");
+    QRegExp re("/(?:user|channel)/[a-zA-Z0-9]+[^>]+data-ytid=[\"']([^\"']+)[\"'][^>]+>([a-zA-Z0-9 ]+)</a>");
 
     int pos = 0;
     while ((pos = re.indexIn(html, pos)) != -1) {
-        // qDebug() << re.cap(0) << re.cap(1);
-        QString choice = re.cap(1);
+        QString choice = re.cap(2);
         if (!choices.contains(choice, Qt::CaseInsensitive)) {
-            suggestions << new Suggestion(choice);
+            qDebug() << re.capturedTexts();
+            QString channelId = re.cap(1);
+            suggestions << new Suggestion(choice, "channel", channelId);
             choices << choice;
-            if (choices.size() == 10) break;
+            if (choices.size() == maxSuggestions) break;
         }
         pos += re.matchedLength();
     }