Upload 3.9.3-2 to unstable

[minitube] / src / channelsuggest.cpp

diff --git a/src/channelsuggest.cpp b/src/channelsuggest.cpp
index c36afb73dc8a271681c665436a84d839425a04a2..eff93b4de205b58c9dc88a21342993884dd8fba3 100644 (file)
--- a/src/channelsuggest.cpp
+++ b/src/channelsuggest.cpp
@@ -1,46 +1,64 @@
-#include "channelsuggest.h"
-#include "networkaccess.h"
+/* $BEGIN_LICENSE
 
-namespace The {
-    NetworkAccess* http();
-}
+This file is part of Minitube.
+Copyright 2009, Flavio Tordini <flavio.tordini@gmail.com>
 
-ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester() {
+Minitube is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-}
+Minitube is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-void ChannelSuggest::suggest(QString query) {
+You should have received a copy of the GNU General Public License
+along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 
-    /* // TODO how to localize results?
-    QString locale = QLocale::system().name().replace("_", "-");
-    // case for system locales such as "C"
-    if (locale.length() < 2) {
-        locale = "en-US";
-    }*/
+$END_LICENSE */
+
+#include "channelsuggest.h"
+#include "http.h"
+#include "httputils.h"
 
-    QUrl url("http://www.youtube.com/results?search_type=search_users");
-    url.addQueryItem("search_query", query);
-    // url.addQueryItem("hl", "it-IT");
+ChannelSuggest::ChannelSuggest(QObject *parent) : Suggester(parent) {
 
-    QObject *reply = The::http()->get(url);
+}
+
+void ChannelSuggest::suggest(const QString &query) {
+    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;
+    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);
-        if (!choices.contains(choice)) {
+        QString choice = re.cap(2);
+        if (!choices.contains(choice, Qt::CaseInsensitive)) {
+            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();
     }
 
-    emit ready(choices);
+    emit ready(suggestions);
 }