Imported Upstream version 2.4

[minitube] / src / ytstandardfeed.cpp

diff --git a/src/ytstandardfeed.cpp b/src/ytstandardfeed.cpp
index ee5e0030f141a8982754fd5840eec756f7eed638..59ce7304c857ef111a10c6209ef9bc24545a55c2 100644 (file)
--- a/src/ytstandardfeed.cpp
+++ b/src/ytstandardfeed.cpp
@@ -19,20 +19,85 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "ytstandardfeed.h"
-#include <QtXml>
 #include "networkaccess.h"
 #include "video.h"
+
+#ifdef APP_YT3
+#include "yt3.h"
+#include "yt3listparser.h"
+#else
 #include "ytfeedreader.h"
+#endif
 
 namespace The {
 NetworkAccess* http();
 }
 
 YTStandardFeed::YTStandardFeed(QObject *parent)
-    : VideoSource(parent),
+    : PaginatedVideoSource(parent),
       aborted(false) { }
 
-void YTStandardFeed::loadVideos(int max, int skip) {
+#ifdef APP_YT3
+
+void YTStandardFeed::loadVideos(int max, int startIndex) {
+    aborted = false;
+
+    QUrl url = YT3::instance().method("videos");
+
+#if QT_VERSION >= 0x050000
+    {
+        QUrl &u = url;
+        QUrlQuery url;
+#endif
+
+        if (startIndex > 1) {
+            if (maybeReloadToken(max, startIndex)) return;
+            url.addQueryItem("pageToken", nextPageToken);
+        }
+
+        url.addQueryItem("part", "snippet,contentDetails,statistics");
+        url.addQueryItem("chart", "mostPopular");
+
+        if (!category.isEmpty())
+            url.addQueryItem("videoCategoryId", category);
+
+        if (!regionId.isEmpty())
+            url.addQueryItem("regionCode", regionId);
+
+        url.addQueryItem("maxResults", QString::number(max));
+
+#if QT_VERSION >= 0x050000
+        u.setQuery(url);
+    }
+#endif
+    QObject *reply = The::http()->get(url);
+    connect(reply, SIGNAL(data(QByteArray)), SLOT(parseResults(QByteArray)));
+    connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
+}
+
+void YTStandardFeed::parseResults(QByteArray data) {
+    if (aborted) return;
+
+    YT3ListParser parser(data);
+    QList<Video*> videos = parser.getVideos();
+
+    bool tryingWithNewToken = setPageToken(parser.getNextPageToken());
+    if (tryingWithNewToken) return;
+
+    if (reloadingToken) {
+        reloadingToken = false;
+        loadVideos(currentMax, currentStartIndex);
+        currentMax = currentStartIndex = 0;
+        return;
+    }
+
+    emit gotVideos(videos);
+    emit finished(videos.size());
+}
+
+#else
+
+void YTStandardFeed::loadVideos(int max, int startIndex) {
     aborted = false;
 
     QString s = "http://gdata.youtube.com/feeds/api/standardfeeds/";
@@ -42,20 +107,20 @@ void YTStandardFeed::loadVideos(int max, int skip) {
 
     QUrl url(s);
 #if QT_VERSION >= 0x050000
-{
-    QUrl &u = url;
-    QUrlQuery url;
+    {
+        QUrl &u = url;
+        QUrlQuery url;
 #endif
-    url.addQueryItem("v", "2");
+        url.addQueryItem("v", "2");
 
-    if (feedId != "most_shared" && feedId != "on_the_web") {
-        QString t = time;
-        if (t.isEmpty()) t = "today";
-        url.addQueryItem("time", t);
-    }
+        if (feedId != "most_shared" && feedId != "on_the_web") {
+            QString t = time;
+            if (t.isEmpty()) t = "today";
+            url.addQueryItem("time", t);
+        }
 
-    url.addQueryItem("max-results", QString::number(max));
-    url.addQueryItem("start-index", QString::number(skip));
+        url.addQueryItem("max-results", QString::number(max));
+        url.addQueryItem("start-index", QString::number(startIndex));
 
 #if QT_VERSION >= 0x050000
         u.setQuery(url);
@@ -66,16 +131,7 @@ void YTStandardFeed::loadVideos(int max, int skip) {
     connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
 }
 
-void YTStandardFeed::abort() {
-    aborted = true;
-}
-
-const QStringList & YTStandardFeed::getSuggestions() {
-    QStringList *l = new QStringList();
-    return *l;
-}
-
-void YTStandardFeed::parse(QByteArray data) {
+void YTStandardFeed::parseResults(QByteArray data) {
     if (aborted) return;
 
     YTFeedReader reader(data);
@@ -85,6 +141,17 @@ void YTStandardFeed::parse(QByteArray data) {
     emit finished(videos.size());
 }
 
+#endif
+
+void YTStandardFeed::abort() {
+    aborted = true;
+}
+
+const QStringList & YTStandardFeed::getSuggestions() {
+    QStringList *l = new QStringList();
+    return *l;
+}
+
 void YTStandardFeed::requestError(QNetworkReply *reply) {
     emit error(reply->errorString());
 }