X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fytsinglevideosource.cpp;h=09936cad8f1a541deb831f31331c4e45f351219c;hb=8cea1b650a0122369e8a3d60da1f263767b67614;hp=b4f4d308943341e810a5862f2650b43e77134d73;hpb=7cdd5bd476021ec84d54c4ec5be02280e1e9e548;p=minitube

diff --git a/src/ytsinglevideosource.cpp b/src/ytsinglevideosource.cpp
index b4f4d30..09936ca 100644
--- a/src/ytsinglevideosource.cpp
+++ b/src/ytsinglevideosource.cpp
@@ -19,72 +19,96 @@ along with Minitube.  If not, see <http://www.gnu.org/licenses/>.
 $END_LICENSE */
 
 #include "ytsinglevideosource.h"
-#include <QtXml>
-#include "networkaccess.h"
+#include "http.h"
+#include "httputils.h"
 #include "video.h"
-#include "ytfeedreader.h"
 
-namespace The {
-NetworkAccess* http();
-}
+#include "yt3.h"
+#include "yt3listparser.h"
 
-YTSingleVideoSource::YTSingleVideoSource(QObject *parent) : VideoSource(parent) {
-    skip = 0;
-    max = 0;
-}
+YTSingleVideoSource::YTSingleVideoSource(QObject *parent)
+    : PaginatedVideoSource(parent), video(nullptr), startIndex(0), max(0) {}
 
-void YTSingleVideoSource::loadVideos(int max, int skip) {
+void YTSingleVideoSource::loadVideos(int max, int startIndex) {
     aborted = false;
-    this->skip = skip;
+    this->startIndex = startIndex;
     this->max = max;
 
-    QString s;
-    if (skip == 1) s = "http://gdata.youtube.com/feeds/api/videos/" + videoId;
-    else s = QString("http://gdata.youtube.com/feeds/api/videos/%1/related").arg(videoId);
-    QUrl url(s);
-    url.addQueryItem("v", "2");
-
-    if (skip != 1) {
-        url.addQueryItem("max-results", QString::number(max));
-        url.addQueryItem("start-index", QString::number(skip-1));
+    QUrl url;
+
+    if (startIndex == 1) {
+        if (video) {
+            QVector<Video *> videos;
+            videos << video->clone();
+            if (name.isEmpty()) {
+                name = videos.at(0)->getTitle();
+                qDebug() << "Emitting name changed" << name;
+                emit nameChanged(name);
+            }
+            emit gotVideos(videos);
+            loadVideos(max - 1, 2);
+            return;
+        }
+
+        url = YT3::instance().method("videos");
+        QUrlQuery q(url);
+        q.addQueryItem("part", "snippet");
+        q.addQueryItem("id", videoId);
+        url.setQuery(q);
+
+    } else {
+        url = YT3::instance().method("search");
+        QUrlQuery q(url);
+        q.addQueryItem("part", "snippet");
+        q.addQueryItem("type", "video");
+        q.addQueryItem("relatedToVideoId", videoId);
+        q.addQueryItem("maxResults", QString::number(max));
+        if (startIndex > 2) {
+            if (maybeReloadToken(max, startIndex)) return;
+            q.addQueryItem("pageToken", nextPageToken);
+        }
+        url.setQuery(q);
     }
 
-    QObject *reply = The::http()->get(url);
-    connect(reply, SIGNAL(data(QByteArray)), SLOT(parse(QByteArray)));
-    connect(reply, SIGNAL(error(QNetworkReply*)), SLOT(requestError(QNetworkReply*)));
+    lastUrl = url;
+
+    QObject *reply = HttpUtils::yt().get(url);
+    connect(reply, SIGNAL(data(QByteArray)), SLOT(parseResults(QByteArray)));
+    connect(reply, SIGNAL(error(QString)), SLOT(requestError(QString)));
 }
 
-void YTSingleVideoSource::abort() {
-    aborted = true;
+void YTSingleVideoSource::parseResults(QByteArray data) {
+    if (aborted) return;
+
+    YT3ListParser parser(data);
+    const QVector<Video *> &videos = parser.getVideos();
+
+    bool tryingWithNewToken = setPageToken(parser.getNextPageToken());
+    if (tryingWithNewToken) return;
+
+    if (asyncDetails) {
+        emit gotVideos(videos);
+        if (startIndex == 2)
+            emit finished(videos.size() + 1);
+        else
+            emit finished(videos.size());
+    }
+    loadVideoDetails(videos);
 }
 
-const QStringList & YTSingleVideoSource::getSuggestions() {
-    QStringList *l = new QStringList();
-    return *l;
+void YTSingleVideoSource::abort() {
+    aborted = true;
 }
 
 QString YTSingleVideoSource::getName() {
     return name;
 }
 
-void YTSingleVideoSource::parse(QByteArray data) {
-    if (aborted) return;
-
-    YTFeedReader reader(data);
-    QList<Video*> videos = reader.getVideos();
-
-    if (name.isEmpty() && !videos.isEmpty() && skip == 1) {
-        name = videos.first()->title();
-        emit nameChanged(name);
-    }
-
-    emit gotVideos(videos);
-
-    if (skip == 1) loadVideos(max - 1, 2);
-    else if (skip == 2) emit finished(videos.size() + 1);
-    else emit finished(videos.size());
+void YTSingleVideoSource::setVideo(Video *video) {
+    this->video = video;
+    videoId = video->getId();
 }
 
-void YTSingleVideoSource::requestError(QNetworkReply *reply) {
-    emit error(reply->errorString());
+void YTSingleVideoSource::requestError(const QString &message) {
+    emit error(message);
 }